diff options
author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2011-03-08 21:05:08 -0500 |
---|---|---|
committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2011-03-08 21:05:08 -0500 |
commit | 9b1fc4e4973469dd3fab27ba5d78eca1cd5c13fe (patch) | |
tree | 0f51872d41cbc1e43db2fafab0074c107dfce7e7 /fs/nilfs2/super.c | |
parent | 693dd321222f03b17668f88ceb0f7d518900191e (diff) |
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: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs/nilfs2/super.c')
-rw-r--r-- | fs/nilfs2/super.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index 6dc8b3cad127..1368c4293c7f 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c | |||
@@ -43,7 +43,6 @@ | |||
43 | #include <linux/init.h> | 43 | #include <linux/init.h> |
44 | #include <linux/blkdev.h> | 44 | #include <linux/blkdev.h> |
45 | #include <linux/parser.h> | 45 | #include <linux/parser.h> |
46 | #include <linux/random.h> | ||
47 | #include <linux/crc32.h> | 46 | #include <linux/crc32.h> |
48 | #include <linux/vfs.h> | 47 | #include <linux/vfs.h> |
49 | #include <linux/writeback.h> | 48 | #include <linux/writeback.h> |
@@ -943,16 +942,6 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent) | |||
943 | if (err) | 942 | if (err) |
944 | goto failed_nilfs; | 943 | goto failed_nilfs; |
945 | 944 | ||
946 | /* | ||
947 | * Following initialization is overlapped because | ||
948 | * nilfs_sb_info structure has been cleared at the beginning. | ||
949 | * But we reserve them to keep our interest and make ready | ||
950 | * for the future change. | ||
951 | */ | ||
952 | get_random_bytes(&sbi->s_next_generation, | ||
953 | sizeof(sbi->s_next_generation)); | ||
954 | spin_lock_init(&sbi->s_next_gen_lock); | ||
955 | |||
956 | sb->s_op = &nilfs_sops; | 945 | sb->s_op = &nilfs_sops; |
957 | sb->s_export_op = &nilfs_export_ops; | 946 | sb->s_export_op = &nilfs_export_ops; |
958 | sb->s_root = NULL; | 947 | sb->s_root = NULL; |