summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-13 16:51:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-13 16:51:29 -0700
commit8c35bf368c4e533d07610810e4c3b84c34c8e201 (patch)
treeff998cc7192bac73452c64ef5f2a45dd7ea3e7d5
parentfec896e21b65278a67b3a98073eef23351a74a4a (diff)
parentb1e86db1de2e8bc2be9fb94fae3451c2a776e8c1 (diff)
Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux: nfsd: fix BUG at fs/nfsd/nfsfh.h:199 on unlink
-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 cdfb8c6a4206..c16f8d8331b5 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);