exofs: switch to new i_version API
Signed-off-by: Jeff Layton <jlayton@redhat.com>
This commit is contained in:
Родитель
c7f88c4e78
Коммит
317bc94780
|
@ -31,6 +31,7 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <linux/iversion.h>
|
||||
#include "exofs.h"
|
||||
|
||||
static inline unsigned exofs_chunk_size(struct inode *inode)
|
||||
|
@ -60,7 +61,7 @@ static int exofs_commit_chunk(struct page *page, loff_t pos, unsigned len)
|
|||
struct inode *dir = mapping->host;
|
||||
int err = 0;
|
||||
|
||||
dir->i_version++;
|
||||
inode_inc_iversion(dir);
|
||||
|
||||
if (!PageUptodate(page))
|
||||
SetPageUptodate(page);
|
||||
|
@ -241,7 +242,7 @@ exofs_readdir(struct file *file, struct dir_context *ctx)
|
|||
unsigned long n = pos >> PAGE_SHIFT;
|
||||
unsigned long npages = dir_pages(inode);
|
||||
unsigned chunk_mask = ~(exofs_chunk_size(inode)-1);
|
||||
int need_revalidate = (file->f_version != inode->i_version);
|
||||
bool need_revalidate = inode_cmp_iversion(inode, file->f_version);
|
||||
|
||||
if (pos > inode->i_size - EXOFS_DIR_REC_LEN(1))
|
||||
return 0;
|
||||
|
@ -264,8 +265,8 @@ exofs_readdir(struct file *file, struct dir_context *ctx)
|
|||
chunk_mask);
|
||||
ctx->pos = (n<<PAGE_SHIFT) + offset;
|
||||
}
|
||||
file->f_version = inode->i_version;
|
||||
need_revalidate = 0;
|
||||
file->f_version = inode_query_iversion(inode);
|
||||
need_revalidate = false;
|
||||
}
|
||||
de = (struct exofs_dir_entry *)(kaddr + offset);
|
||||
limit = kaddr + exofs_last_byte(inode, n) -
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/exportfs.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/iversion.h>
|
||||
|
||||
#include "exofs.h"
|
||||
|
||||
|
@ -159,7 +160,7 @@ static struct inode *exofs_alloc_inode(struct super_block *sb)
|
|||
if (!oi)
|
||||
return NULL;
|
||||
|
||||
oi->vfs_inode.i_version = 1;
|
||||
inode_set_iversion(&oi->vfs_inode, 1);
|
||||
return &oi->vfs_inode;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче