Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a6b871d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs fix from Al Viro:
 "An embarrassing bug in lustre patches from this cycle ;-/"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [regression] braino in "lustre: use is_root_inode()"
parents 29169f82 5242d422

drivers/staging/lustre/lustre/llite/namei.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -264,7 +264,7 @@ int ll_md_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, 




		if ((bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_PERM)) &&

		if ((bits & (MDS_INODELOCK_LOOKUP | MDS_INODELOCK_PERM)) &&

		    inode->i_sb->s_root != NULL &&

		    inode->i_sb->s_root != NULL &&

		    is_root_inode(inode))

		    !is_root_inode(inode))

			ll_invalidate_aliases(inode);

			ll_invalidate_aliases(inode);





		iput(inode);

		iput(inode);