From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from fieldses.org ([174.143.236.118]:39394 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758271Ab2HUSEZ (ORCPT ); Tue, 21 Aug 2012 14:04:25 -0400 Date: Tue, 21 Aug 2012 14:04:24 -0400 From: "J. Bruce Fields" To: Jeff Layton Cc: linux-nfs@vger.kernel.org Subject: Re: [PATCH] knfsd: remove bogus BUG_ON() call from nfsd4_locku Message-ID: <20120821180424.GA16497@fieldses.org> References: <1345550551-9683-1-git-send-email-jlayton@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1345550551-9683-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: On Tue, Aug 21, 2012 at 08:02:31AM -0400, Jeff Layton wrote: > The code checks for a NULL filp and handles it gracefully just before > this BUG_ON. Thanks, applying for 3.6.--b. > > Signed-off-by: Jeff Layton > --- > fs/nfsd/nfs4state.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 566a9b7..6e12fd5 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -4294,7 +4294,6 @@ nfsd4_locku(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, > status = nfserr_lock_range; > goto out; > } > - BUG_ON(!filp); > locks_init_lock(&file_lock); > file_lock.fl_type = F_UNLCK; > file_lock.fl_owner = (fl_owner_t)lockowner(stp->st_stateowner); > -- > 1.7.11.4 >