diff options
author | Jeff Layton <jlayton@redhat.com> | 2017-12-11 06:35:09 -0500 |
---|---|---|
committer | Jeff Layton <jlayton@redhat.com> | 2018-01-29 06:42:20 -0500 |
commit | 2489dbabea80e8c075eb01bf195d8bb0b1440dd2 (patch) | |
tree | f4698270eff79f02ec615024ea2deb51eb227188 /fs/fat/inode.c | |
parent | 7594c461161745f0d38a4346d4f895e0837b8094 (diff) |
fat: convert to new i_version API
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Diffstat (limited to 'fs/fat/inode.c')
-rw-r--r-- | fs/fat/inode.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 20a0a89eaca5..ffbbf0520d9e 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/blkdev.h> | 20 | #include <linux/blkdev.h> |
21 | #include <linux/backing-dev.h> | 21 | #include <linux/backing-dev.h> |
22 | #include <asm/unaligned.h> | 22 | #include <asm/unaligned.h> |
23 | #include <linux/iversion.h> | ||
23 | #include "fat.h" | 24 | #include "fat.h" |
24 | 25 | ||
25 | #ifndef CONFIG_FAT_DEFAULT_IOCHARSET | 26 | #ifndef CONFIG_FAT_DEFAULT_IOCHARSET |
@@ -507,7 +508,7 @@ int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de) | |||
507 | MSDOS_I(inode)->i_pos = 0; | 508 | MSDOS_I(inode)->i_pos = 0; |
508 | inode->i_uid = sbi->options.fs_uid; | 509 | inode->i_uid = sbi->options.fs_uid; |
509 | inode->i_gid = sbi->options.fs_gid; | 510 | inode->i_gid = sbi->options.fs_gid; |
510 | inode->i_version++; | 511 | inode_inc_iversion(inode); |
511 | inode->i_generation = get_seconds(); | 512 | inode->i_generation = get_seconds(); |
512 | 513 | ||
513 | if ((de->attr & ATTR_DIR) && !IS_FREE(de->name)) { | 514 | if ((de->attr & ATTR_DIR) && !IS_FREE(de->name)) { |
@@ -590,7 +591,7 @@ struct inode *fat_build_inode(struct super_block *sb, | |||
590 | goto out; | 591 | goto out; |
591 | } | 592 | } |
592 | inode->i_ino = iunique(sb, MSDOS_ROOT_INO); | 593 | inode->i_ino = iunique(sb, MSDOS_ROOT_INO); |
593 | inode->i_version = 1; | 594 | inode_set_iversion(inode, 1); |
594 | err = fat_fill_inode(inode, de); | 595 | err = fat_fill_inode(inode, de); |
595 | if (err) { | 596 | if (err) { |
596 | iput(inode); | 597 | iput(inode); |
@@ -1377,7 +1378,7 @@ static int fat_read_root(struct inode *inode) | |||
1377 | MSDOS_I(inode)->i_pos = MSDOS_ROOT_INO; | 1378 | MSDOS_I(inode)->i_pos = MSDOS_ROOT_INO; |
1378 | inode->i_uid = sbi->options.fs_uid; | 1379 | inode->i_uid = sbi->options.fs_uid; |
1379 | inode->i_gid = sbi->options.fs_gid; | 1380 | inode->i_gid = sbi->options.fs_gid; |
1380 | inode->i_version++; | 1381 | inode_inc_iversion(inode); |
1381 | inode->i_generation = 0; | 1382 | inode->i_generation = 0; |
1382 | inode->i_mode = fat_make_mode(sbi, ATTR_DIR, S_IRWXUGO); | 1383 | inode->i_mode = fat_make_mode(sbi, ATTR_DIR, S_IRWXUGO); |
1383 | inode->i_op = sbi->dir_ops; | 1384 | inode->i_op = sbi->dir_ops; |
@@ -1828,7 +1829,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat, | |||
1828 | if (!root_inode) | 1829 | if (!root_inode) |
1829 | goto out_fail; | 1830 | goto out_fail; |
1830 | root_inode->i_ino = MSDOS_ROOT_INO; | 1831 | root_inode->i_ino = MSDOS_ROOT_INO; |
1831 | root_inode->i_version = 1; | 1832 | inode_set_iversion(root_inode, 1); |
1832 | error = fat_read_root(root_inode); | 1833 | error = fat_read_root(root_inode); |
1833 | if (error < 0) { | 1834 | if (error < 0) { |
1834 | iput(root_inode); | 1835 | iput(root_inode); |