Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ufs: use new i_version API

Signed-off-by: Jeff Layton <jlayton@redhat.com>

+9 -6
+5 -4
fs/ufs/dir.c
··· 20 20 #include <linux/time.h> 21 21 #include <linux/fs.h> 22 22 #include <linux/swap.h> 23 + #include <linux/iversion.h> 23 24 24 25 #include "ufs_fs.h" 25 26 #include "ufs.h" ··· 48 47 struct inode *dir = mapping->host; 49 48 int err = 0; 50 49 51 - dir->i_version++; 50 + inode_inc_iversion(dir); 52 51 block_write_end(NULL, mapping, pos, len, len, page, NULL); 53 52 if (pos+len > dir->i_size) { 54 53 i_size_write(dir, pos+len); ··· 429 428 unsigned long n = pos >> PAGE_SHIFT; 430 429 unsigned long npages = dir_pages(inode); 431 430 unsigned chunk_mask = ~(UFS_SB(sb)->s_uspi->s_dirblksize - 1); 432 - int need_revalidate = file->f_version != inode->i_version; 431 + bool need_revalidate = inode_cmp_iversion(inode, file->f_version); 433 432 unsigned flags = UFS_SB(sb)->s_flags; 434 433 435 434 UFSD("BEGIN\n"); ··· 456 455 offset = ufs_validate_entry(sb, kaddr, offset, chunk_mask); 457 456 ctx->pos = (n<<PAGE_SHIFT) + offset; 458 457 } 459 - file->f_version = inode->i_version; 460 - need_revalidate = 0; 458 + file->f_version = inode_query_iversion(inode); 459 + need_revalidate = false; 461 460 } 462 461 de = (struct ufs_dir_entry *)(kaddr+offset); 463 462 limit = kaddr + ufs_last_byte(inode, n) - UFS_DIR_REC_LEN(1);
+2 -1
fs/ufs/inode.c
··· 36 36 #include <linux/mm.h> 37 37 #include <linux/buffer_head.h> 38 38 #include <linux/writeback.h> 39 + #include <linux/iversion.h> 39 40 40 41 #include "ufs_fs.h" 41 42 #include "ufs.h" ··· 694 693 if (err) 695 694 goto bad_inode; 696 695 697 - inode->i_version++; 696 + inode_inc_iversion(inode); 698 697 ufsi->i_lastfrag = 699 698 (inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift; 700 699 ufsi->i_dir_start_lookup = 0;
+2 -1
fs/ufs/super.c
··· 88 88 #include <linux/log2.h> 89 89 #include <linux/mount.h> 90 90 #include <linux/seq_file.h> 91 + #include <linux/iversion.h> 91 92 92 93 #include "ufs_fs.h" 93 94 #include "ufs.h" ··· 1441 1440 if (!ei) 1442 1441 return NULL; 1443 1442 1444 - ei->vfs_inode.i_version = 1; 1443 + inode_set_iversion(&ei->vfs_inode, 1); 1445 1444 seqlock_init(&ei->meta_lock); 1446 1445 mutex_init(&ei->truncate_mutex); 1447 1446 return &ei->vfs_inode;