Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753680AbYAHTeb (ORCPT ); Tue, 8 Jan 2008 14:34:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757863AbYAHTeB (ORCPT ); Tue, 8 Jan 2008 14:34:01 -0500 Received: from mx1.redhat.com ([66.187.233.31]:36808 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757849AbYAHTd7 (ORCPT ); Tue, 8 Jan 2008 14:33:59 -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 4/6] NLM: Have lockd call try_to_freeze Date: Tue, 8 Jan 2008 14:33:16 -0500 Message-Id: <1199820798-5289-5-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.5.3.3 In-Reply-To: <1199820798-5289-4-git-send-email-jlayton@redhat.com> References: <1199820798-5289-1-git-send-email-jlayton@redhat.com> <1199820798-5289-2-git-send-email-jlayton@redhat.com> <1199820798-5289-3-git-send-email-jlayton@redhat.com> <1199820798-5289-4-git-send-email-jlayton@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 857 Lines: 30 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 0f4148a..03a83a0 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.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/