nilfs2: do not repair reserved inode bitmap in nilfs_new_inode()
authorRyusuke Konishi <konishi.ryusuke@gmail.com>
Mon, 26 Aug 2024 17:41:13 +0000 (02:41 +0900)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 2 Sep 2024 03:43:43 +0000 (20:43 -0700)
After commit 93aef9eda1ce ("nilfs2: fix incorrect inode allocation from
reserved inodes") is applied, the inode number returned by
nilfs_ifile_create_inode() is guaranteed to always be greater than or
equal to NILFS_USER_INO, so if the inode number is a reserved inode number
(less than NILFS_USER_INO), the code to repair the bitmap immediately
following it is no longer executed.  So, delete it.

Link: https://lkml.kernel.org/r/20240826174116.5008-6-konishi.ryusuke@gmail.com
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Cc: Huang Xiaojia <huangxiaojia2@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/nilfs2/inode.c

index 3c4a0577bc714d29fa0e44f2787d77dc89cc16fa..3742baec49201e0b25ee665479a3ccc130d6e1e8 100644 (file)
@@ -345,19 +345,6 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)
        if (unlikely(err))
                goto failed_ifile_create_inode;
        /* reference count of i_bh inherits from nilfs_mdt_read_block() */
-
-       if (unlikely(ino < NILFS_USER_INO)) {
-               nilfs_warn(sb,
-                          "inode bitmap is inconsistent for reserved inodes");
-               do {
-                       brelse(bh);
-                       err = nilfs_ifile_create_inode(root->ifile, &ino, &bh);
-                       if (unlikely(err))
-                               goto failed_ifile_create_inode;
-               } while (ino < NILFS_USER_INO);
-
-               nilfs_info(sb, "repaired inode bitmap for reserved inodes");
-       }
        ii->i_bh = bh;
 
        atomic64_inc(&root->inodes_count);