openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2010-10-13 16:51:29 -07:00
parent fec896e21b b1e86db1de
commit 8c35bf368c
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/nfsfh.h
View File

@ -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);