Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25b18d39 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: decrement inodes count only if raw inode was successfully deleted 



This fixes the issue that inodes count will not add up after removal
of raw inodes fails.  Hence, this prevents possible under flow of the
inodes count.

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent a5abba98

fs/nilfs2/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -707,6 +707,7 @@ void nilfs_evict_inode(struct inode *inode) 
	struct nilfs_transaction_info ti;

	struct super_block *sb = inode->i_sb;

	struct nilfs_inode_info *ii = NILFS_I(inode);

	int ret;



	if (inode->i_nlink || !ii->i_root || unlikely(is_bad_inode(inode))) {

		if (inode->i_data.nrpages)
@@ -725,7 +726,8 @@ void nilfs_evict_inode(struct inode *inode) 
	nilfs_mark_inode_dirty(inode);

	end_writeback(inode);



	nilfs_ifile_delete_inode(ii->i_root->ifile, inode->i_ino);

	ret = nilfs_ifile_delete_inode(ii->i_root->ifile, inode->i_ino);

	if (!ret)

		atomic_dec(&ii->i_root->inodes_count);



	nilfs_clear_inode(inode);