diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ubifs/dir.c | 1 | ||||
-rw-r--r-- | fs/ubifs/super.c | 2 | ||||
-rw-r--r-- | fs/ubifs/ubifs.h | 4 |
3 files changed, 1 insertions, 6 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index eba3a8a7c333..0d1ab8967a4c 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c | |||
@@ -165,7 +165,6 @@ struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir, | |||
165 | } | 165 | } |
166 | 166 | ||
167 | inode->i_ino = ++c->highest_inum; | 167 | inode->i_ino = ++c->highest_inum; |
168 | inode->i_generation = ++c->vfs_gen; | ||
169 | /* | 168 | /* |
170 | * The creation sequence number remains with this inode for its | 169 | * The creation sequence number remains with this inode for its |
171 | * lifetime. All nodes for this inode have a greater sequence number, | 170 | * lifetime. All nodes for this inode have a greater sequence number, |
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 6cc4175f23c1..2c268a476413 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
32 | #include <linux/ctype.h> | 32 | #include <linux/ctype.h> |
33 | #include <linux/random.h> | ||
34 | #include <linux/kthread.h> | 33 | #include <linux/kthread.h> |
35 | #include <linux/parser.h> | 34 | #include <linux/parser.h> |
36 | #include <linux/seq_file.h> | 35 | #include <linux/seq_file.h> |
@@ -1671,7 +1670,6 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) | |||
1671 | INIT_LIST_HEAD(&c->orph_new); | 1670 | INIT_LIST_HEAD(&c->orph_new); |
1672 | 1671 | ||
1673 | c->highest_inum = UBIFS_FIRST_INO; | 1672 | c->highest_inum = UBIFS_FIRST_INO; |
1674 | get_random_bytes(&c->vfs_gen, sizeof(int)); | ||
1675 | c->lhead_lnum = c->ltail_lnum = UBIFS_LOG_LNUM; | 1673 | c->lhead_lnum = c->ltail_lnum = UBIFS_LOG_LNUM; |
1676 | 1674 | ||
1677 | ubi_get_volume_info(ubi, &c->vi); | 1675 | ubi_get_volume_info(ubi, &c->vi); |
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 73ca8a009798..f2dd749d7989 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h | |||
@@ -876,11 +876,10 @@ struct ubifs_mount_opts { | |||
876 | * @bdi: backing device info object to make VFS happy and disable read-ahead | 876 | * @bdi: backing device info object to make VFS happy and disable read-ahead |
877 | * | 877 | * |
878 | * @highest_inum: highest used inode number | 878 | * @highest_inum: highest used inode number |
879 | * @vfs_gen: VFS inode generation counter | ||
880 | * @max_sqnum: current global sequence number | 879 | * @max_sqnum: current global sequence number |
881 | * @cmt_no: commit number of the last successfully completed commit, protected | 880 | * @cmt_no: commit number of the last successfully completed commit, protected |
882 | * by @commit_sem | 881 | * by @commit_sem |
883 | * @cnt_lock: protects @highest_inum, @vfs_gen, and @max_sqnum counters | 882 | * @cnt_lock: protects @highest_inum and @max_sqnum counters |
884 | * @fmt_version: UBIFS on-flash format version | 883 | * @fmt_version: UBIFS on-flash format version |
885 | * @uuid: UUID from super block | 884 | * @uuid: UUID from super block |
886 | * | 885 | * |
@@ -1117,7 +1116,6 @@ struct ubifs_info { | |||
1117 | struct backing_dev_info bdi; | 1116 | struct backing_dev_info bdi; |
1118 | 1117 | ||
1119 | ino_t highest_inum; | 1118 | ino_t highest_inum; |
1120 | unsigned int vfs_gen; | ||
1121 | unsigned long long max_sqnum; | 1119 | unsigned long long max_sqnum; |
1122 | unsigned long long cmt_no; | 1120 | unsigned long long cmt_no; |
1123 | spinlock_t cnt_lock; | 1121 | spinlock_t cnt_lock; |