From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759883AbYAJSDE (ORCPT ); Thu, 10 Jan 2008 13:03:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757863AbYAJSC3 (ORCPT ); Thu, 10 Jan 2008 13:02:29 -0500 Received: from mx1.redhat.com ([66.187.233.31]:42087 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757249AbYAJSC1 (ORCPT ); Thu, 10 Jan 2008 13:02:27 -0500 From: Jeff Layton To: akpm@linux-foundation.org, neilb@suse.de Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] NLM: Have lockd call try_to_freeze Date: Thu, 10 Jan 2008 13:01:34 -0500 Message-Id: <1199988096-19700-4-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.5.3.3 In-Reply-To: <1199988096-19700-3-git-send-email-jlayton@redhat.com> References: <1199988096-19700-1-git-send-email-jlayton@redhat.com> <1199988096-19700-2-git-send-email-jlayton@redhat.com> <1199988096-19700-3-git-send-email-jlayton@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org lockd makes itself freezable, but never calls try_to_freeze(). Have it call try_to_freeze() within the main loop. Signed-off-by: Jeff Layton --- fs/lockd/svc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 82e2192..6ee8bed 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -155,6 +155,9 @@ lockd(struct svc_rqst *rqstp) long timeout = MAX_SCHEDULE_TIMEOUT; char buf[RPC_MAX_ADDRBUFLEN]; + if (try_to_freeze()) + continue; + if (signalled()) { flush_signals(current); if (nlmsvc_ops) { -- 1.5.3.7