lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 581/772] NFS: fsync() should report filesystem errors over EINTR/ERESTARTSYS
    Date
    From: Trond Myklebust <trond.myklebust@hammerspace.com>

    [ Upstream commit 9641d9bc9b75f11f70646f5c6ee9f5f519a1012e ]

    If the commit to disk is interrupted, we should still first check for
    filesystem errors so that we can report them in preference to the error
    due to the signal.

    Fixes: 2197e9b06c22 ("NFS: Fix up fsync() when the server rebooted")
    Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/nfs/file.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/fs/nfs/file.c b/fs/nfs/file.c
    index d8583f57ff99..ce761c88d260 100644
    --- a/fs/nfs/file.c
    +++ b/fs/nfs/file.c
    @@ -209,15 +209,16 @@ static int
    nfs_file_fsync_commit(struct file *file, int datasync)
    {
    struct inode *inode = file_inode(file);
    - int ret;
    + int ret, ret2;

    dprintk("NFS: fsync file(%pD2) datasync %d\n", file, datasync);

    nfs_inc_stats(inode, NFSIOS_VFSFSYNC);
    ret = nfs_commit_inode(inode, FLUSH_SYNC);
    - if (ret < 0)
    - return ret;
    - return file_check_and_advance_wb_err(file);
    + ret2 = file_check_and_advance_wb_err(file);
    + if (ret2 < 0)
    + return ret2;
    + return ret;
    }

    int
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 23:30    [W:4.019 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site