Merge branch 'for-linus' into for-next

2015-06-17 14:44:05 -04:00
parent b853a16176 e4f95517f1
commit 4ef51e8b7a
9 changed files with 85 additions and 79 deletions
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -903,6 +903,9 @@ void ufs_evict_inode(struct inode * inode)
 	invalidate_inode_buffers(inode);
 	clear_inode(inode);

-	if (want_delete)
+	if (want_delete) {
+		lock_ufs(inode->i_sb);
 		ufs_free_inode(inode);
+		unlock_ufs(inode->i_sb);
+	}
 }