Commit 8c35bf36 authored by Linus Torvalds's avatar Linus Torvalds

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
parents fec896e2 b1e86db1
...@@ -196,8 +196,6 @@ fh_lock(struct svc_fh *fhp) ...@@ -196,8 +196,6 @@ fh_lock(struct svc_fh *fhp)
static inline void static inline void
fh_unlock(struct svc_fh *fhp) fh_unlock(struct svc_fh *fhp)
{ {
BUG_ON(!fhp->fh_dentry);
if (fhp->fh_locked) { if (fhp->fh_locked) {
fill_post_wcc(fhp); fill_post_wcc(fhp);
mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex); mutex_unlock(&fhp->fh_dentry->d_inode->i_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment