diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-10 01:33:30 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-10 17:11:51 -0400 |
commit | fc64005c93090c052637f63578d810b037abb1a1 (patch) | |
tree | 7762f9680fd773cf265465b0e5f95e4732b90def /fs/btrfs/tree-log.c | |
parent | 04c57f4501909b60353031cfe5b991751d745658 (diff) |
don't bother with ->d_inode->i_sb - it's always equal to ->d_sb
... and neither can ever be NULL
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/tree-log.c')
-rw-r--r-- | fs/btrfs/tree-log.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 24d03c751149..a82e20ecbee1 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c | |||
@@ -4851,7 +4851,7 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans, | |||
4851 | goto out; | 4851 | goto out; |
4852 | 4852 | ||
4853 | if (!S_ISDIR(inode->i_mode)) { | 4853 | if (!S_ISDIR(inode->i_mode)) { |
4854 | if (!parent || d_really_is_negative(parent) || sb != d_inode(parent)->i_sb) | 4854 | if (!parent || d_really_is_negative(parent) || sb != parent->d_sb) |
4855 | goto out; | 4855 | goto out; |
4856 | inode = d_inode(parent); | 4856 | inode = d_inode(parent); |
4857 | } | 4857 | } |
@@ -4872,7 +4872,7 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans, | |||
4872 | break; | 4872 | break; |
4873 | } | 4873 | } |
4874 | 4874 | ||
4875 | if (!parent || d_really_is_negative(parent) || sb != d_inode(parent)->i_sb) | 4875 | if (!parent || d_really_is_negative(parent) || sb != parent->d_sb) |
4876 | break; | 4876 | break; |
4877 | 4877 | ||
4878 | if (IS_ROOT(parent)) | 4878 | if (IS_ROOT(parent)) |
@@ -5285,7 +5285,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, | |||
5285 | } | 5285 | } |
5286 | 5286 | ||
5287 | while (1) { | 5287 | while (1) { |
5288 | if (!parent || d_really_is_negative(parent) || sb != d_inode(parent)->i_sb) | 5288 | if (!parent || d_really_is_negative(parent) || sb != parent->d_sb) |
5289 | break; | 5289 | break; |
5290 | 5290 | ||
5291 | inode = d_inode(parent); | 5291 | inode = d_inode(parent); |