Commit 33d23d84 authored by Ryusuke Konishi's avatar Ryusuke Konishi Committed by Andrew Morton
Browse files

nilfs2: do not repair reserved inode bitmap in nilfs_new_inode() 

After commit 93aef9ed ("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: default avatarRyusuke Konishi <konishi.ryusuke@gmail.com>
Cc: Huang Xiaojia <huangxiaojia2@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9860f434

fs/nilfs2/inode.c

+0 −13
Original line number Diff line number Diff line
@@ -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);