* [PATCH] knfsd: remove bogus BUG_ON() call from nfsd4_locku
@ 2012-08-21 12:02 Jeff Layton
2012-08-21 18:04 ` J. Bruce Fields
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Layton @ 2012-08-21 12:02 UTC (permalink / raw)
To: bfields; +Cc: linux-nfs
The code checks for a NULL filp and handles it gracefully just before
this BUG_ON.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] knfsd: remove bogus BUG_ON() call from nfsd4_locku
2012-08-21 12:02 [PATCH] knfsd: remove bogus BUG_ON() call from nfsd4_locku Jeff Layton
@ 2012-08-21 18:04 ` J. Bruce Fields
0 siblings, 0 replies; 2+ messages in thread
From: J. Bruce Fields @ 2012-08-21 18:04 UTC (permalink / raw)
To: Jeff Layton; +Cc: linux-nfs
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 <jlayton@redhat.com>
> ---
> 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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-21 18:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-21 12:02 [PATCH] knfsd: remove bogus BUG_ON() call from nfsd4_locku Jeff Layton
2012-08-21 18:04 ` J. Bruce Fields
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).