lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 238/542] nfsd: Clone should commit src file metadata too
    Date
    From: Trond Myklebust <trondmy@gmail.com>

    [ Upstream commit 57f64034966fb945fc958f95f0c51e47af590344 ]

    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: Dave Chinner <david@fromorbit.com>
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Acked-by: Dave Chinner <david@fromorbit.com>
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfsd/vfs.c | 19 ++++++++++++++-----
    1 file changed, 14 insertions(+), 5 deletions(-)

    diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
    index f0bca0e87d0c4..82cf80dde5c71 100644
    --- a/fs/nfsd/vfs.c
    +++ b/fs/nfsd/vfs.c
    @@ -280,19 +280,25 @@ nfsd_lookup(struct svc_rqst *rqstp, struct svc_fh *fhp, const char *name,
    * Commit metadata changes to stable storage.
    */
    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;

    - if (!EX_ISSYNC(fhp->fh_export))
    - return 0;
    -
    if (export_ops->commit_metadata)
    return export_ops->commit_metadata(inode);
    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
    * NFS semantics and what Linux expects.
    @@ -537,6 +543,9 @@ __be32 nfsd4_clone_file_range(struct file *src, u64 src_pos, struct file *dst,
    if (sync) {
    loff_t dst_end = count ? dst_pos + count - 1 : LLONG_MAX;
    int status = vfs_fsync_range(dst, dst_pos, dst_end, 0);
    +
    + if (!status)
    + status = commit_inode_metadata(file_inode(src));
    if (status < 0)
    return nfserrno(status);
    }
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:41    [W:2.495 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site