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

Commit cd812599 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Remove the "NFS_CAP_CHANGE_ATTR" capability 



Setting the change attribute has been mandatory for all NFS versions, since
commit 3a1556e8 ("NFSv2/v3: Simulate the change attribute"). We should
therefore not have anything be conditional on it being set/unset.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 5c675d64

fs/nfs/client.c

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ static int nfs_init_server(struct nfs_server *server, 
	server->options = data->options;

	server->caps |= NFS_CAP_HARDLINKS|NFS_CAP_SYMLINKS|NFS_CAP_FILEID|

		NFS_CAP_MODE|NFS_CAP_NLINK|NFS_CAP_OWNER|NFS_CAP_OWNER_GROUP|

		NFS_CAP_ATIME|NFS_CAP_CTIME|NFS_CAP_MTIME|NFS_CAP_CHANGE_ATTR;

		NFS_CAP_ATIME|NFS_CAP_CTIME|NFS_CAP_MTIME;



	if (data->rsize)

		server->rsize = nfs_block_size(data->rsize, NULL);

fs/nfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr, st 
			nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR);

		if (fattr->valid & NFS_ATTR_FATTR_CHANGE)

			inode->i_version = fattr->change_attr;

		else if (nfs_server_capable(inode, NFS_CAP_CHANGE_ATTR))

		else

			nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR

				| NFS_INO_REVAL_PAGECACHE);

		if (fattr->valid & NFS_ATTR_FATTR_SIZE)
@@ -1692,7 +1692,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
				nfs_force_lookup_revalidate(inode);

			inode->i_version = fattr->change_attr;

		}

	} else if (server->caps & NFS_CAP_CHANGE_ATTR)

	} else

		nfsi->cache_validity |= save_cache_validity;



	if (fattr->valid & NFS_ATTR_FATTR_MTIME) {

fs/nfs/nfs4proc.c

+0 −3
Original line number Diff line number Diff line
@@ -8591,7 +8591,6 @@ static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = { 
	.minor_version = 0,

	.init_caps = NFS_CAP_READDIRPLUS

		| NFS_CAP_ATOMIC_OPEN

		| NFS_CAP_CHANGE_ATTR

		| NFS_CAP_POSIX_LOCK,

	.init_client = nfs40_init_client,

	.shutdown_client = nfs40_shutdown_client,
@@ -8617,7 +8616,6 @@ static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = { 
	.minor_version = 1,

	.init_caps = NFS_CAP_READDIRPLUS

		| NFS_CAP_ATOMIC_OPEN

		| NFS_CAP_CHANGE_ATTR

		| NFS_CAP_POSIX_LOCK

		| NFS_CAP_STATEID_NFSV41

		| NFS_CAP_ATOMIC_OPEN_V1,
@@ -8640,7 +8638,6 @@ static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = { 
	.minor_version = 2,

	.init_caps = NFS_CAP_READDIRPLUS

		| NFS_CAP_ATOMIC_OPEN

		| NFS_CAP_CHANGE_ATTR

		| NFS_CAP_POSIX_LOCK

		| NFS_CAP_STATEID_NFSV41

		| NFS_CAP_ATOMIC_OPEN_V1

include/linux/nfs_fs_sb.h

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ struct nfs_server { 
#define NFS_CAP_SYMLINKS	(1U << 2)

#define NFS_CAP_ACLS		(1U << 3)

#define NFS_CAP_ATOMIC_OPEN	(1U << 4)

#define NFS_CAP_CHANGE_ATTR	(1U << 5)

/* #define NFS_CAP_CHANGE_ATTR	(1U << 5) */

#define NFS_CAP_FILEID		(1U << 6)

#define NFS_CAP_MODE		(1U << 7)

#define NFS_CAP_NLINK		(1U << 8)