aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-28 13:02:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-28 13:02:27 -0800
commit9a6b871d988cac4093a7be99de3cae000abda88b (patch)
tree5efb2348350b4637eac6c92b26171a9f7a13fe12
parent29169f823067b07bc2967f64ec4b6c9cd1a714a4 (diff)
parent5242d422973d949c3b651efa049bcb1b5ef98ce9 (diff)
downloadnovena-linux-9a6b871d988cac4093a7be99de3cae000abda88b.tar.gz
novena-linux-9a6b871d988cac4093a7be99de3cae000abda88b.tar.bz2
novena-linux-9a6b871d988cac4093a7be99de3cae000abda88b.zip
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()"
-rw-r--r--drivers/staging/lustre/lustre/llite/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 1bf891bd321..4f361b77c74 100644
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -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)) &&
inode->i_sb->s_root != NULL &&
- is_root_inode(inode))
+ !is_root_inode(inode))
ll_invalidate_aliases(inode);
iput(inode);