mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-22 09:34:56 +02:00
nfsd: update mtime/ctime on CLONE in presense of delegated attributes
commit2863bac7f4upstream. When delegated attributes are given on open, the file is opened with NOCMTIME and modifying operations do not update mtime/ctime as to not get out-of-sync with the client's delegated view. However, for CLONE operation, the server should update its view of mtime/ctime and reflect that in any GETATTR queries. Fixes:e5e9b24ab8("nfsd: freeze c/mtime updates with outstanding WRITE_ATTRS delegation") Cc: stable@vger.kernel.org Signed-off-by: Olga Kornievskaia <okorniev@redhat.com> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> [ cel:9be4b7e74eand3daab3112fare missing from linux-6.18.y ] Signed-off-by: Chuck Lever <cel@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
5015432073
commit
7c702bb4f8
@@ -1350,6 +1350,9 @@ nfsd4_clone(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
|
||||
dst, clone->cl_dst_pos, clone->cl_count,
|
||||
EX_ISSYNC(cstate->current_fh.fh_export));
|
||||
|
||||
if (!status && (READ_ONCE(dst->nf_file->f_mode) & FMODE_NOCMTIME) != 0)
|
||||
nfsd_update_cmtime_attr(dst->nf_file, 0);
|
||||
|
||||
nfsd_file_put(dst);
|
||||
nfsd_file_put(src);
|
||||
out:
|
||||
|
||||
+29
-15
@@ -1226,10 +1226,6 @@ static void put_deleg_file(struct nfs4_file *fp)
|
||||
|
||||
static void nfsd4_finalize_deleg_timestamps(struct nfs4_delegation *dp, struct file *f)
|
||||
{
|
||||
struct iattr ia = { .ia_valid = ATTR_ATIME | ATTR_CTIME | ATTR_MTIME | ATTR_DELEG };
|
||||
struct inode *inode = file_inode(f);
|
||||
int ret;
|
||||
|
||||
/* don't do anything if FMODE_NOCMTIME isn't set */
|
||||
if ((READ_ONCE(f->f_mode) & FMODE_NOCMTIME) == 0)
|
||||
return;
|
||||
@@ -1247,17 +1243,7 @@ static void nfsd4_finalize_deleg_timestamps(struct nfs4_delegation *dp, struct f
|
||||
return;
|
||||
|
||||
/* Stamp everything to "now" */
|
||||
inode_lock(inode);
|
||||
ret = notify_change(&nop_mnt_idmap, f->f_path.dentry, &ia, NULL);
|
||||
inode_unlock(inode);
|
||||
if (ret) {
|
||||
struct inode *inode = file_inode(f);
|
||||
|
||||
pr_notice_ratelimited("Unable to update timestamps on inode %02x:%02x:%lu: %d\n",
|
||||
MAJOR(inode->i_sb->s_dev),
|
||||
MINOR(inode->i_sb->s_dev),
|
||||
inode->i_ino, ret);
|
||||
}
|
||||
nfsd_update_cmtime_attr(f, ATTR_ATIME);
|
||||
}
|
||||
|
||||
static void nfs4_unlock_deleg_lease(struct nfs4_delegation *dp)
|
||||
@@ -9434,3 +9420,31 @@ out_status:
|
||||
nfs4_put_stid(&dp->dl_stid);
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* nfsd_update_cmtime_attr - update file's delegated ctime/mtime,
|
||||
* and optionally other attributes (ie ATTR_ATIME).
|
||||
* @f: pointer to an opened file
|
||||
* @flags: any additional flags that should be updated
|
||||
*
|
||||
* Given upon opening a file delegated attributes were issues, update
|
||||
* @f attributes to current times.
|
||||
*/
|
||||
void nfsd_update_cmtime_attr(struct file *f, unsigned int flags)
|
||||
{
|
||||
int ret;
|
||||
struct inode *inode = file_inode(f);
|
||||
struct iattr attr = {
|
||||
.ia_valid = ATTR_CTIME | ATTR_MTIME | ATTR_DELEG | flags,
|
||||
};
|
||||
|
||||
inode_lock(inode);
|
||||
ret = notify_change(&nop_mnt_idmap, f->f_path.dentry, &attr, NULL);
|
||||
inode_unlock(inode);
|
||||
if (ret)
|
||||
pr_notice_ratelimited("nfsd: Unable to update timestamps on "
|
||||
"inode %02x:%02x:%lu: %d\n",
|
||||
MAJOR(inode->i_sb->s_dev),
|
||||
MINOR(inode->i_sb->s_dev),
|
||||
inode->i_ino, ret);
|
||||
}
|
||||
|
||||
@@ -831,6 +831,7 @@ extern void nfsd4_shutdown_callback(struct nfs4_client *);
|
||||
extern void nfsd4_shutdown_copy(struct nfs4_client *clp);
|
||||
void nfsd4_async_copy_reaper(struct nfsd_net *nn);
|
||||
bool nfsd4_has_active_async_copies(struct nfs4_client *clp);
|
||||
void nfsd_update_cmtime_attr(struct file *f, unsigned int flags);
|
||||
extern struct nfs4_client_reclaim *nfs4_client_to_reclaim(struct xdr_netobj name,
|
||||
struct xdr_netobj princhash, struct nfsd_net *nn);
|
||||
extern bool nfs4_has_reclaimed_state(struct xdr_netobj name, struct nfsd_net *nn);
|
||||
|
||||
Reference in New Issue
Block a user