[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20231026021627.23284-1-mengferry@linux.alibaba.com>
Date: Thu, 26 Oct 2023 10:16:26 +0800
From: Ferry Meng <mengferry@...ux.alibaba.com>
To: linux-erofs@...ts.ozlabs.org
Cc: LKML <linux-kernel@...r.kernel.org>,
Ferry Meng <mengferry@...ux.alibaba.com>
Subject: [PATCH 1/2] erofs: get rid of ROOT_NID()
Let's open code this helper for simplicity.
Signed-off-by: Ferry Meng <mengferry@...ux.alibaba.com>
---
fs/erofs/internal.h | 2 --
fs/erofs/super.c | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 4ff88d0dd980..ca7d85958450 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -228,8 +228,6 @@ struct erofs_buf {
};
#define __EROFS_BUF_INITIALIZER ((struct erofs_buf){ .page = NULL })
-#define ROOT_NID(sb) ((sb)->root_nid)
-
#define erofs_blknr(sb, addr) ((addr) >> (sb)->s_blocksize_bits)
#define erofs_blkoff(sb, addr) ((addr) & ((sb)->s_blocksize - 1))
#define erofs_pos(sb, blk) ((erofs_off_t)(blk) << (sb)->s_blocksize_bits)
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 3700af9ee173..019229eb2ef6 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -724,13 +724,13 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
xa_init(&sbi->managed_pslots);
#endif
- inode = erofs_iget(sb, ROOT_NID(sbi));
+ inode = erofs_iget(sb, sbi->root_nid);
if (IS_ERR(inode))
return PTR_ERR(inode);
if (!S_ISDIR(inode->i_mode)) {
erofs_err(sb, "rootino(nid %llu) is not a directory(i_mode %o)",
- ROOT_NID(sbi), inode->i_mode);
+ sbi->root_nid, inode->i_mode);
iput(inode);
return -EINVAL;
}
@@ -760,7 +760,7 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
if (err)
return err;
- erofs_info(sb, "mounted with root inode @ nid %llu.", ROOT_NID(sbi));
+ erofs_info(sb, "mounted with root inode @ nid %llu.", sbi->root_nid);
return 0;
}
--
2.19.1.6.gb485710b
Powered by blists - more mailing lists