diff options
| author | Chunguang Xu <brookxu@tencent.com> | 2020-09-24 11:03:42 +0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-10-18 10:36:59 -0400 |
| commit | ee7ed3aa0f08621dbf897d2a98dc6f2c7e7d0335 (patch) | |
| tree | e442547c018d5b5a7b1447da4591f52cf636167a /fs/ext4/fsmap.c | |
| parent | 15a119e09344a346384ec05c781c126a29b18235 (diff) | |
ext4: rename journal_dev to s_journal_dev inside ext4_sb_info
Rename journal_dev to s_journal_dev inside ext4_sb_info, keep
the naming rules consistent with other variables, which is
convenient for code reading and writing.
Signed-off-by: Chunguang Xu <brookxu@tencent.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com>
Link: https://lore.kernel.org/r/1600916623-544-1-git-send-email-brookxu@tencent.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/fsmap.c')
| -rw-r--r-- | fs/ext4/fsmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/fsmap.c b/fs/ext4/fsmap.c index dbccf46f1770..005c0ae95a0e 100644 --- a/fs/ext4/fsmap.c +++ b/fs/ext4/fsmap.c @@ -571,8 +571,8 @@ static bool ext4_getfsmap_is_valid_device(struct super_block *sb, if (fm->fmr_device == 0 || fm->fmr_device == UINT_MAX || fm->fmr_device == new_encode_dev(sb->s_bdev->bd_dev)) return true; - if (EXT4_SB(sb)->journal_bdev && - fm->fmr_device == new_encode_dev(EXT4_SB(sb)->journal_bdev->bd_dev)) + if (EXT4_SB(sb)->s_journal_bdev && + fm->fmr_device == new_encode_dev(EXT4_SB(sb)->s_journal_bdev->bd_dev)) return true; return false; } @@ -642,9 +642,9 @@ int ext4_getfsmap(struct super_block *sb, struct ext4_fsmap_head *head, memset(handlers, 0, sizeof(handlers)); handlers[0].gfd_dev = new_encode_dev(sb->s_bdev->bd_dev); handlers[0].gfd_fn = ext4_getfsmap_datadev; - if (EXT4_SB(sb)->journal_bdev) { + if (EXT4_SB(sb)->s_journal_bdev) { handlers[1].gfd_dev = new_encode_dev( - EXT4_SB(sb)->journal_bdev->bd_dev); + EXT4_SB(sb)->s_journal_bdev->bd_dev); handlers[1].gfd_fn = ext4_getfsmap_logdev; } |