lkml.org 
[lkml]   [2011]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] xfs: Fix wrong return value of xfs_file_aio_write
    On 2011.07.24 at 07:16 -0400, Christoph Hellwig wrote:
    > On Sun, Jul 24, 2011 at 12:02:12AM +0200, Markus Trippelsdorf wrote:
    > > The following patch fixes the problem for me:
    >
    > Good catch, can you send it with a proper signoff and description?

    The fsync prototype change commit 02c24a82187d accidentally overwrote
    the ssize_t return value of xfs_file_aio_write with 0 for SYNC type
    writes. Fix this by checking if an error occured when calling
    xfs_file_fsync and only change the return value in this case.
    In addition xfs_file_fsync actually returns a normal negative error, so
    fix this, too.
    ---
    fs/xfs/linux-2.6/xfs_file.c | 5 ++++-
    1 files changed, 4 insertions(+), 1 deletions(-)

    diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
    index cca00f4..825390e 100644
    --- a/fs/xfs/linux-2.6/xfs_file.c
    +++ b/fs/xfs/linux-2.6/xfs_file.c
    @@ -881,11 +881,14 @@ xfs_file_aio_write(
    /* Handle various SYNC-type writes */
    if ((file->f_flags & O_DSYNC) || IS_SYNC(inode)) {
    loff_t end = pos + ret - 1;
    + int error;

    xfs_rw_iunlock(ip, iolock);
    - ret = -xfs_file_fsync(file, pos, end,
    + error = xfs_file_fsync(file, pos, end,
    (file->f_flags & __O_SYNC) ? 0 : 1);
    xfs_rw_ilock(ip, iolock);
    + if (error)
    + ret = error;
    }

    out_unlock:
    --
    Markus

    \
     
     \ /
      Last update: 2011-07-24 13:59    [W:0.019 / U:30.712 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site