superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nfs: update inode ctime after removexattr operation 

xfstest generic/728 fails with delegated timestamps. The client does a
removexattr and then a stat to test the ctime, which doesn't change. The
stat() doesn't trigger a GETATTR because of the delegated timestamps, so
it relies on the cached ctime, which is wrong.

The setxattr compound has a trailing GETATTR, which ensures that its
ctime gets updated. Follow the same strategy with removexattr.

Fixes: 3e1f02123f ("NFSv4.2: add client side XDR handling for extended attributes")
Reported-by: Olga Kornievskaia <aglo@umich.edu>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
master
Jeff Layton 2026-03-24 13:32:12 -04:00 committed by Trond Myklebust
parent 16d99dce93
commit 9c332d7f63
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/nfs/nfs42proc.c
View File

@ -1372,11 +1372,15 @@ out_put_src_lock:
static int _nfs42_proc_removexattr(struct inode *inode, const char *name) static int _nfs42_proc_removexattr(struct inode *inode, const char *name)
{ {
struct nfs_server *server = NFS_SERVER(inode); struct nfs_server *server = NFS_SERVER(inode);
__u32 bitmask[NFS_BITMASK_SZ];
struct nfs42_removexattrargs args = { struct nfs42_removexattrargs args = {
.fh = NFS_FH(inode), .fh = NFS_FH(inode),
.bitmask = bitmask,
.xattr_name = name, .xattr_name = name,
}; };
struct nfs42_removexattrres res; struct nfs42_removexattrres res = {
.server = server,
};
struct rpc_message msg = { struct rpc_message msg = {
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_REMOVEXATTR], .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_REMOVEXATTR],
.rpc_argp = &args, .rpc_argp = &args,
@ -1385,12 +1389,22 @@ static int _nfs42_proc_removexattr(struct inode *inode, const char *name)
int ret; int ret;
unsigned long timestamp = jiffies; unsigned long timestamp = jiffies;
res.fattr = nfs_alloc_fattr();
if (!res.fattr)
return -ENOMEM;
nfs4_bitmask_set(bitmask, server->cache_consistency_bitmask,
inode, NFS_INO_INVALID_CHANGE);
ret = nfs4_call_sync(server->client, server, &msg, &args.seq_args, ret = nfs4_call_sync(server->client, server, &msg, &args.seq_args,
&res.seq_res, 1); &res.seq_res, 1);
trace_nfs4_removexattr(inode, name, ret); trace_nfs4_removexattr(inode, name, ret);
if (!ret) if (!ret) {
nfs4_update_changeattr(inode, &res.cinfo, timestamp, 0); nfs4_update_changeattr(inode, &res.cinfo, timestamp, 0);
ret = nfs_post_op_update_inode(inode, res.fattr);
}
kfree(res.fattr);
return ret; return ret;
} }

10
fs/nfs/nfs42xdr.c
View File

@ -263,11 +263,13 @@
#define NFS4_enc_removexattr_sz (compound_encode_hdr_maxsz + \ #define NFS4_enc_removexattr_sz (compound_encode_hdr_maxsz + \
encode_sequence_maxsz + \ encode_sequence_maxsz + \
encode_putfh_maxsz + \ encode_putfh_maxsz + \
encode_removexattr_maxsz) encode_removexattr_maxsz + \
encode_getattr_maxsz)
#define NFS4_dec_removexattr_sz (compound_decode_hdr_maxsz + \ #define NFS4_dec_removexattr_sz (compound_decode_hdr_maxsz + \
decode_sequence_maxsz + \ decode_sequence_maxsz + \
decode_putfh_maxsz + \ decode_putfh_maxsz + \
decode_removexattr_maxsz) decode_removexattr_maxsz + \
decode_getattr_maxsz)
/* /*
* These values specify the maximum amount of data that is not * These values specify the maximum amount of data that is not
@ -869,6 +871,7 @@ static void nfs4_xdr_enc_removexattr(struct rpc_rqst *req,
encode_sequence(xdr, &args->seq_args, &hdr); encode_sequence(xdr, &args->seq_args, &hdr);
encode_putfh(xdr, args->fh, &hdr); encode_putfh(xdr, args->fh, &hdr);
encode_removexattr(xdr, args->xattr_name, &hdr); encode_removexattr(xdr, args->xattr_name, &hdr);
encode_getfattr(xdr, args->bitmask, &hdr);
encode_nops(&hdr); encode_nops(&hdr);
} }
@ -1818,6 +1821,9 @@ static int nfs4_xdr_dec_removexattr(struct rpc_rqst *req,
goto out; goto out;
status = decode_removexattr(xdr, &res->cinfo); status = decode_removexattr(xdr, &res->cinfo);
if (status)
goto out;
status = decode_getfattr(xdr, res->fattr, res->server);
out: out:
return status; return status;
} }

3
include/linux/nfs_xdr.h
View File

@ -1611,12 +1611,15 @@ struct nfs42_listxattrsres {
struct nfs42_removexattrargs { struct nfs42_removexattrargs {
struct nfs4_sequence_args seq_args; struct nfs4_sequence_args seq_args;
struct nfs_fh *fh; struct nfs_fh *fh;
const u32 *bitmask;
const char *xattr_name; const char *xattr_name;
}; };
struct nfs42_removexattrres { struct nfs42_removexattrres {
struct nfs4_sequence_res seq_res; struct nfs4_sequence_res seq_res;
struct nfs4_change_info cinfo; struct nfs4_change_info cinfo;
struct nfs_fattr *fattr;
const struct nfs_server *server;
}; };
#endif /* CONFIG_NFS_V4_2 */ #endif /* CONFIG_NFS_V4_2 */