Commit 57f64034 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields

nfsd: Clone should commit src file metadata too

vfs_clone_file_range() can modify the metadata on the source file too,
so we need to commit that to stable storage as well.
Reported-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Acked-by: default avatarDave Chinner <david@fromorbit.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent fc5fc5d7
...@@ -280,19 +280,25 @@ nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name, ...@@ -280,19 +280,25 @@ nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name,
* Commit metadata changes to stable storage. * Commit metadata changes to stable storage.
*/ */
static int static int
commit_metadata(struct svc_fh *fhp) commit_inode_metadata(struct inode *inode)
{ {
struct inode *inode = d_inode(fhp->fh_dentry);
const struct export_operations *export_ops = inode->i_sb->s_export_op; const struct export_operations *export_ops = inode->i_sb->s_export_op;
if (!EX_ISSYNC(fhp->fh_export))
return 0;
if (export_ops->commit_metadata) if (export_ops->commit_metadata)
return export_ops->commit_metadata(inode); return export_ops->commit_metadata(inode);
return sync_inode_metadata(inode, 1); return sync_inode_metadata(inode, 1);
} }
static int
commit_metadata(struct svc_fh *fhp)
{
struct inode *inode = d_inode(fhp->fh_dentry);
if (!EX_ISSYNC(fhp->fh_export))
return 0;
return commit_inode_metadata(inode);
}
/* /*
* Go over the attributes and take care of the small differences between * Go over the attributes and take care of the small differences between
* NFS semantics and what Linux expects. * NFS semantics and what Linux expects.
...@@ -537,6 +543,9 @@ __be32 nfsd4_clone_file_range(struct file *src, u64 src_pos, struct file *dst, ...@@ -537,6 +543,9 @@ __be32 nfsd4_clone_file_range(struct file *src, u64 src_pos, struct file *dst,
if (sync) { if (sync) {
loff_t dst_end = count ? dst_pos + count - 1 : LLONG_MAX; loff_t dst_end = count ? dst_pos + count - 1 : LLONG_MAX;
int status = vfs_fsync_range(dst, dst_pos, dst_end, 0); int status = vfs_fsync_range(dst, dst_pos, dst_end, 0);
if (!status)
status = commit_inode_metadata(file_inode(src));
if (status < 0) if (status < 0)
return nfserrno(status); return nfserrno(status);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment