diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-13 19:51:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-13 19:51:29 -0400 |
| commit | 8c35bf368c4e533d07610810e4c3b84c34c8e201 (patch) | |
| tree | ff998cc7192bac73452c64ef5f2a45dd7ea3e7d5 /fs | |
| parent | fec896e21b65278a67b3a98073eef23351a74a4a (diff) | |
| parent | b1e86db1de2e8bc2be9fb94fae3451c2a776e8c1 (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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfsfh.h | 2 |
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) | |||
| 196 | static inline void | 196 | static inline void |
| 197 | fh_unlock(struct svc_fh *fhp) | 197 | fh_unlock(struct svc_fh *fhp) |
| 198 | { | 198 | { |
| 199 | BUG_ON(!fhp->fh_dentry); | ||
| 200 | |||
| 201 | if (fhp->fh_locked) { | 199 | if (fhp->fh_locked) { |
| 202 | fill_post_wcc(fhp); | 200 | fill_post_wcc(fhp); |
| 203 | mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex); | 201 | mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex); |