On Wed, 2010-12-15 at 12:23 +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> xfs_file_aio_write() only returns the error from synchronous
> flushing of the data and inode if error == 0. At the point where
> error is being checked, it is guaranteed to be > 0. Therefore any
Actually, we have this above the affected code:
...
error = -ret;
if (ret <= 0)
goto out_unlock_internal;
So ret must be positive, therefore error is negative
(the negative of the number of bytes written). In
other words, we enter this block without having seen
an error.
The return at the end of the function is:
return -error;
And by the convoluted logic here, that means that the
value of error should be a negative byte count if
successful, or a positive errno otherwise.
And since filemap_write_and_wait_range() returns a
negative errno, your fix doesn't look right to me.
The existing code is wrong and should be fixed, but a
better fix might make the meaning of the variable "error"
a little less weird.
-Alex
> errors returned by the data or fsync flush will never be returned.
> Fix the checks so we overwrite the current error once and only if an
> error really occurred.
>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> ---
> fs/xfs/linux-2.6/xfs_file.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c
> index ba8ad42..e1eaec2 100644
> --- a/fs/xfs/linux-2.6/xfs_file.c
> +++ b/fs/xfs/linux-2.6/xfs_file.c
> @@ -769,7 +769,7 @@ write_retry:
> mutex_unlock(&inode->i_mutex);
>
> error2 = filemap_write_and_wait_range(mapping, pos, end);
> - if (!error)
> + if (error2)
> error = error2;
> if (need_i_mutex)
> mutex_lock(&inode->i_mutex);
> @@ -777,7 +777,7 @@ write_retry:
>
> error2 = -xfs_file_fsync(file,
> (file->f_flags & __O_SYNC) ? 0 : 1);
> - if (!error)
> + if (error2 && error >= 0)
> error = error2;
> }
>
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
