diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-10-18 09:25:09 -0600 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-10-18 09:25:09 -0600 |
commit | db181a8ee158fd0ccea2e2670c4f2d36af2814a0 (patch) | |
tree | d03adc3926b4aca7ee172d825b90fe965b4f01b9 /fs/nfsd/nfsfh.h | |
parent | ee2007d299ad4020115b193858817e6c57e95db5 (diff) | |
parent | 9c0a788b4315b83f6138ffa15c56ccf541106e58 (diff) |
Merge branch 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin into spi/next
Diffstat (limited to 'fs/nfsd/nfsfh.h')
-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 cdfb8c6a420..c16f8d8331b 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); |