aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2010-10-13 14:46:17 -0400
committerJ. Bruce Fields <bfields@redhat.com>2010-10-13 15:48:55 -0400
commitb1e86db1de2e8bc2be9fb94fae3451c2a776e8c1 (patch)
tree60405feda18e4145fc335c8c85f46d33816bc9e0
parentcb655d0f3d57c23db51b981648e452988c0223f9 (diff)
downloadmrst-s0i3-test-b1e86db1de2e8bc2be9fb94fae3451c2a776e8c1.tar.gz
mrst-s0i3-test-b1e86db1de2e8bc2be9fb94fae3451c2a776e8c1.tar.xz
mrst-s0i3-test-b1e86db1de2e8bc2be9fb94fae3451c2a776e8c1.zip
nfsd: fix BUG at fs/nfsd/nfsfh.h:199 on unlink
As of commit 43a9aa64a2f4330a9cb59aaf5c5636566bce067c "NFSD: Fill in WCC data for REMOVE, RMDIR, MKNOD, and MKDIR", we sometimes call fh_unlock on a filehandle that isn't fully initialized. We should fix up the callers, but as a quick fix it is also sufficient just to remove this assertion. Reported-by: Marius Tolzmann <tolzmann@molgen.mpg.de> Cc: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfsfh.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h
index cdfb8c6a420..c16f8d8331b 100644
--- a/fs/nfsd/nfsfh.h
+++ b/fs/nfsd/nfsfh.h
@@ -196,8 +196,6 @@ fh_lock(struct svc_fh *fhp)
static inline void
fh_unlock(struct svc_fh *fhp)
{
- BUG_ON(!fhp->fh_dentry);
-
if (fhp->fh_locked) {
fill_post_wcc(fhp);
mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex);