Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a01179e6 authored by Jeff Layton's avatar Jeff Layton
Browse files

afs: convert to new i_version API 



For AFS, it's generally treated as an opaque value, so we use the
*_raw variants of the API here.

Note that AFS has quite a different definition for this counter. AFS
only increments it on changes to the data to the data in regular files
and contents of the directories. Inode metadata changes do not result
in a version increment.

We'll need to reconcile that somehow if we ever want to present this to
userspace via statx.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
parent 9dffe569

fs/afs/fsclient.c

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/slab.h>

#include <linux/sched.h>

#include <linux/circ_buf.h>

#include <linux/iversion.h>

#include "internal.h"

#include "afs_fs.h"
@@ -124,7 +125,7 @@ static void xdr_decode_AFSFetchStatus(const __be32 **_bp, 
		vnode->vfs_inode.i_ctime.tv_sec	= status->mtime_client;

		vnode->vfs_inode.i_mtime	= vnode->vfs_inode.i_ctime;

		vnode->vfs_inode.i_atime	= vnode->vfs_inode.i_ctime;

		vnode->vfs_inode.i_version	= data_version;

		inode_set_iversion_raw(&vnode->vfs_inode, data_version);

	}



	expected_version = status->data_version;

fs/afs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/sched.h>

#include <linux/mount.h>

#include <linux/namei.h>

#include <linux/iversion.h>

#include "internal.h"



static const struct inode_operations afs_symlink_inode_operations = {
@@ -89,7 +90,7 @@ static int afs_inode_map_status(struct afs_vnode *vnode, struct key *key) 
	inode->i_atime		= inode->i_mtime = inode->i_ctime;

	inode->i_blocks		= 0;

	inode->i_generation	= vnode->fid.unique;

	inode->i_version	= vnode->status.data_version;

	inode_set_iversion_raw(inode, vnode->status.data_version);

	inode->i_mapping->a_ops	= &afs_fs_aops;



	read_sequnlock_excl(&vnode->cb_lock);
@@ -218,7 +219,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name, 
	inode->i_ctime.tv_nsec	= 0;

	inode->i_atime		= inode->i_mtime = inode->i_ctime;

	inode->i_blocks		= 0;

	inode->i_version	= 0;

	inode_set_iversion_raw(inode, 0);

	inode->i_generation	= 0;



	set_bit(AFS_VNODE_PSEUDODIR, &vnode->flags);