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

Commit b7c06342 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: move inode count and block count into root object 



This moves sbi->s_inodes_count and sbi->s_blocks_count into nilfs_root
object.

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

fs/nilfs2/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ struct inode *nilfs_new_inode(struct inode *dir, int mode) 
		goto failed_ifile_create_inode;

	/* reference count of i_bh inherits from nilfs_mdt_read_block() */



	atomic_inc(&sbi->s_inodes_count);

	atomic_inc(&root->inodes_count);

	inode_init_owner(inode, dir, mode);

	inode->i_ino = ino;

	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
@@ -715,7 +715,7 @@ void nilfs_evict_inode(struct inode *inode) 
	end_writeback(inode);



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

	atomic_dec(&NILFS_SB(sb)->s_inodes_count);

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



	nilfs_clear_inode(inode);

fs/nilfs2/sb.h

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ struct nilfs_sc_info; 
struct nilfs_sb_info {

	/* Snapshot status */

	__u64 s_snapshot_cno;		/* Checkpoint number */

	atomic_t s_inodes_count;

	atomic_t s_blocks_count;	/* Reserved (might be deleted) */



	/* Mount options */

	unsigned long s_mount_opt;

fs/nilfs2/segment.c

+2 −2
Original line number Diff line number Diff line
@@ -856,9 +856,9 @@ static int nilfs_segctor_fill_in_checkpoint(struct nilfs_sc_info *sci) 
	raw_cp->cp_snapshot_list.ssl_next = 0;

	raw_cp->cp_snapshot_list.ssl_prev = 0;

	raw_cp->cp_inodes_count =

		cpu_to_le64(atomic_read(&sbi->s_inodes_count));

		cpu_to_le64(atomic_read(&sci->sc_root->inodes_count));

	raw_cp->cp_blocks_count =

		cpu_to_le64(atomic_read(&sbi->s_blocks_count));

		cpu_to_le64(atomic_read(&sci->sc_root->blocks_count));

	raw_cp->cp_nblk_inc =

		cpu_to_le64(sci->sc_nblk_inc + sci->sc_nblk_this_inc);

	raw_cp->cp_create = cpu_to_le64(sci->sc_seg_ctime);

fs/nilfs2/super.c

+6 −5
Original line number Diff line number Diff line
@@ -429,8 +429,9 @@ int nilfs_attach_checkpoint(struct nilfs_sb_info *sbi, __u64 cno, int curr_mnt, 
	err = nilfs_read_inode_common(root->ifile, &raw_cp->cp_ifile_inode);

	if (unlikely(err))

		goto failed_bh;

	atomic_set(&sbi->s_inodes_count, le64_to_cpu(raw_cp->cp_inodes_count));

	atomic_set(&sbi->s_blocks_count, le64_to_cpu(raw_cp->cp_blocks_count));



	atomic_set(&root->inodes_count, le64_to_cpu(raw_cp->cp_inodes_count));

	atomic_set(&root->blocks_count, le64_to_cpu(raw_cp->cp_blocks_count));



	nilfs_cpfile_put_checkpoint(nilfs->ns_cpfile, cno, bh_cp);
@@ -449,8 +450,8 @@ int nilfs_attach_checkpoint(struct nilfs_sb_info *sbi, __u64 cno, int curr_mnt, 
static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf)

{

	struct super_block *sb = dentry->d_sb;

	struct nilfs_sb_info *sbi = NILFS_SB(sb);

	struct the_nilfs *nilfs = sbi->s_nilfs;

	struct nilfs_root *root = NILFS_I(dentry->d_inode)->i_root;

	struct the_nilfs *nilfs = root->nilfs;

	u64 id = huge_encode_dev(sb->s_bdev->bd_dev);

	unsigned long long blocks;

	unsigned long overhead;
@@ -486,7 +487,7 @@ static int nilfs_statfs(struct dentry *dentry, struct kstatfs *buf) 
	buf->f_bfree = nfreeblocks;

	buf->f_bavail = (buf->f_bfree >= nrsvblocks) ?

		(buf->f_bfree - nrsvblocks) : 0;

	buf->f_files = atomic_read(&sbi->s_inodes_count);

	buf->f_files = atomic_read(&root->inodes_count);

	buf->f_ffree = 0; /* nilfs_count_free_inodes(sb); */

	buf->f_namelen = NILFS_NAME_LEN;

	buf->f_fsid.val[0] = (u32)id;