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:
commit
8c35bf368c
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue