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

Commit 9b1fc4e4 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: move next generation counter into nilfs object 



Moves s_next_generation counter and a spinlock protecting it to nilfs
object from nilfs_sb_info structure.

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

fs/nilfs2/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ const struct address_space_operations nilfs_aops = { 
struct inode *nilfs_new_inode(struct inode *dir, int mode)

{

	struct super_block *sb = dir->i_sb;

	struct nilfs_sb_info *sbi = NILFS_SB(sb);

	struct the_nilfs *nilfs = NILFS_SB(sb)->s_nilfs;

	struct inode *inode;

	struct nilfs_inode_info *ii;

	struct nilfs_root *root;
@@ -340,9 +340,9 @@ struct inode *nilfs_new_inode(struct inode *dir, int mode) 
	/* ii->i_dir_acl = 0; */

	ii->i_dir_start_lookup = 0;

	nilfs_set_inode_flags(inode);

	spin_lock(&sbi->s_next_gen_lock);

	inode->i_generation = sbi->s_next_generation++;

	spin_unlock(&sbi->s_next_gen_lock);

	spin_lock(&nilfs->ns_next_gen_lock);

	inode->i_generation = nilfs->ns_next_generation++;

	spin_unlock(&nilfs->ns_next_gen_lock);

	insert_inode_hash(inode);



	err = nilfs_init_acl(inode, dir);

fs/nilfs2/sb.h

+0 −4
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ struct nilfs_sb_info { 


	/* Segment constructor */

	struct nilfs_sc_info *s_sc_info; /* segment constructor info */



	/* Inode allocator */

	spinlock_t s_next_gen_lock;

	u32 s_next_generation;

};



static inline struct nilfs_sb_info *NILFS_SB(struct super_block *sb)

fs/nilfs2/super.c

+0 −11
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <linux/init.h>

#include <linux/blkdev.h>

#include <linux/parser.h>

#include <linux/random.h>

#include <linux/crc32.h>

#include <linux/vfs.h>

#include <linux/writeback.h>
@@ -943,16 +942,6 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent) 
	if (err)

		goto failed_nilfs;



	/*

	 * Following initialization is overlapped because

	 * nilfs_sb_info structure has been cleared at the beginning.

	 * But we reserve them to keep our interest and make ready

	 * for the future change.

	 */

	get_random_bytes(&sbi->s_next_generation,

			 sizeof(sbi->s_next_generation));

	spin_lock_init(&sbi->s_next_gen_lock);



	sb->s_op = &nilfs_sops;

	sb->s_export_op = &nilfs_export_ops;

	sb->s_root = NULL;

fs/nilfs2/the_nilfs.c

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/slab.h>

#include <linux/blkdev.h>

#include <linux/backing-dev.h>

#include <linux/random.h>

#include <linux/crc32.h>

#include "nilfs.h"

#include "segment.h"
@@ -78,6 +79,7 @@ struct the_nilfs *alloc_nilfs(struct block_device *bdev) 
	INIT_LIST_HEAD(&nilfs->ns_dirty_files);

	INIT_LIST_HEAD(&nilfs->ns_gc_inodes);

	spin_lock_init(&nilfs->ns_inode_lock);

	spin_lock_init(&nilfs->ns_next_gen_lock);

	spin_lock_init(&nilfs->ns_last_segment_lock);

	nilfs->ns_cptree = RB_ROOT;

	spin_lock_init(&nilfs->ns_cptree_lock);
@@ -593,6 +595,9 @@ int init_nilfs(struct the_nilfs *nilfs, struct nilfs_sb_info *sbi, char *data) 
	nilfs->ns_blocksize_bits = sb->s_blocksize_bits;

	nilfs->ns_blocksize = blocksize;



	get_random_bytes(&nilfs->ns_next_generation,

			 sizeof(nilfs->ns_next_generation));



	err = nilfs_store_disk_layout(nilfs, sbp);

	if (err)

		goto failed_sbh;

fs/nilfs2/the_nilfs.h

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ enum { 
 * @ns_dirty_files: list of dirty files

 * @ns_inode_lock: lock protecting @ns_dirty_files

 * @ns_gc_inodes: dummy inodes to keep live blocks

 * @ns_next_generation: next generation number for inodes

 * @ns_next_gen_lock: lock protecting @ns_next_generation

 * @ns_mount_opt: mount options

 * @ns_resuid: uid for reserved blocks

 * @ns_resgid: gid for reserved blocks
@@ -159,6 +161,10 @@ struct the_nilfs { 
	/* GC inode list */

	struct list_head	ns_gc_inodes;



	/* Inode allocator */

	u32			ns_next_generation;

	spinlock_t		ns_next_gen_lock;



	/* Mount options */

	unsigned long		ns_mount_opt;