Skip to content

Commit 6b8a113

Browse files
jdmfrhsiangkao
authored andcommitted
erofs: get rid of ROOT_NID()
Let's open code this helper for simplicity. Signed-off-by: Ferry Meng <[email protected]> Reviewed-by: Gao Xiang <[email protected]> Reviewed-by: Yue Hu <[email protected]> Reviewed-by: Chao Yu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Gao Xiang <[email protected]>
1 parent efb4fb0 commit 6b8a113

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

fs/erofs/internal.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,6 @@ struct erofs_buf {
228228
};
229229
#define __EROFS_BUF_INITIALIZER ((struct erofs_buf){ .page = NULL })
230230

231-
#define ROOT_NID(sb) ((sb)->root_nid)
232-
233231
#define erofs_blknr(sb, addr) ((addr) >> (sb)->s_blocksize_bits)
234232
#define erofs_blkoff(sb, addr) ((addr) & ((sb)->s_blocksize - 1))
235233
#define erofs_pos(sb, blk) ((erofs_off_t)(blk) << (sb)->s_blocksize_bits)

fs/erofs/super.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -668,13 +668,13 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
668668
xa_init(&sbi->managed_pslots);
669669
#endif
670670

671-
inode = erofs_iget(sb, ROOT_NID(sbi));
671+
inode = erofs_iget(sb, sbi->root_nid);
672672
if (IS_ERR(inode))
673673
return PTR_ERR(inode);
674674

675675
if (!S_ISDIR(inode->i_mode)) {
676676
erofs_err(sb, "rootino(nid %llu) is not a directory(i_mode %o)",
677-
ROOT_NID(sbi), inode->i_mode);
677+
sbi->root_nid, inode->i_mode);
678678
iput(inode);
679679
return -EINVAL;
680680
}
@@ -704,7 +704,7 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
704704
if (err)
705705
return err;
706706

707-
erofs_info(sb, "mounted with root inode @ nid %llu.", ROOT_NID(sbi));
707+
erofs_info(sb, "mounted with root inode @ nid %llu.", sbi->root_nid);
708708
return 0;
709709
}
710710

0 commit comments

Comments
 (0)