diff options
| author | Linus Torvalds | 2014-12-28 13:02:27 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2014-12-28 13:02:27 -0800 |
| commit | 9a6b871d988cac4093a7be99de3cae000abda88b (patch) | |
| tree | 5efb2348350b4637eac6c92b26171a9f7a13fe12 /drivers | |
| parent | 29169f823067b07bc2967f64ec4b6c9cd1a714a4 (diff) | |
| parent | 5242d422973d949c3b651efa049bcb1b5ef98ce9 (diff) | |
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()"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/namei.c | 2 |
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 1bf891bd321a..4f361b77c749 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); |