Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux · 8c35bf368c - Gogs

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

Linus Torvalds 14 years ago

parent

fec896e21b b1e86db1de

commit

8c35bf368c

1 changed files with 0 additions and 2 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 2
						
fs/nfsd/nfsfh.h
							 
								View File
							
				@@ -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);