2010-08-16 07:06:32

by Shaohua Li

[permalink] [raw]
Subject: nfs regression 2.6.35+

NFS client runs latest git. At client side, use vim to edit a file located at
NFS server. If I save the file, vim always reports 'E667: Fsync failed'. If I
revert f7fa16506bf9b6323e862a61e14c20555152bb3, vim works. No kernel errors
reported.

Thanks,
Shaohua


2010-08-16 10:09:17

by Takashi Iwai

[permalink] [raw]
Subject: Re: nfs regression 2.6.35+

[Added linux-nfs to Cc]

At Mon, 16 Aug 2010 15:06:26 +0800,
Shaohua Li wrote:
>
> NFS client runs latest git. At client side, use vim to edit a file located at
> NFS server. If I save the file, vim always reports 'E667: Fsync failed'. If I
> revert f7fa16506bf9b6323e862a61e14c20555152bb3, vim works. No kernel errors
> reported.

This hits me, too. Reverting it cures the problem.
(BTW, the correct commit id of the affecting patch is
af7fa16506bf9b6323e862a61e14c20555152bb3
"NFS: Fix up the fsync code")

Reproduced on 2.6.36-rc1.

Looking at strace output,

open("afo", O_WRONLY|O_CREAT|O_TRUNC, 0666) = 4
write(4, "#!/bin\n", 7) = 7
fsync(4) = 1
stat("afo", {st_mode=S_IFREG|0644, st_size=7, ...}) = 0
close(4) = 0

So, fsync() returns 1 wrongly.


thanks,

Takashi

2010-08-16 10:40:18

by Takashi Iwai

[permalink] [raw]
Subject: Re: nfs regression 2.6.35+

At Mon, 16 Aug 2010 12:09:12 +0200, Takashi Iwai wrote:
> At Mon, 16 Aug 2010 15:06:26 +0800,
> Shaohua Li wrote:
> >
> > NFS client runs latest git. At client side, use vim to edit a file located at
> > NFS server. If I save the file, vim always reports 'E667: Fsync failed'. If I
> > revert f7fa16506bf9b6323e862a61e14c20555152bb3, vim works. No kernel errors
> > reported.
>
> This hits me, too. Reverting it cures the problem.
> (BTW, the correct commit id of the affecting patch is
> af7fa16506bf9b6323e862a61e14c20555152bb3
> "NFS: Fix up the fsync code")
>
> Reproduced on 2.6.36-rc1.
>
> Looking at strace output,
>
> open("afo", O_WRONLY|O_CREAT|O_TRUNC, 0666) = 4
> write(4, "#!/bin\n", 7) = 7
> fsync(4) = 1
> stat("afo", {st_mode=S_IFREG|0644, st_size=7, ...}) = 0
> close(4) = 0
>
> So, fsync() returns 1 wrongly.

How about a band-aid fix below?


Takashi


>From c75eab5ac47f5ce27a0d450423f8c46824f832f0 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Mon, 16 Aug 2010 12:25:19 +0200
Subject: [PATCH] NFS: fix fsync return code

With the commit af7fa16506bf9b6323e862a61e14c20555152bb3
NFS: Fix up the fsync code
fsync returns a postive number for success incorrectly because now it
calls nfs_commit_inode() which returns the number of pages.

This patch makes fsync simply ignore a positive return value.

Signed-off-by: Takashi Iwai <[email protected]>
---
fs/nfs/file.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 2d141a7..eb51bd6 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -323,7 +323,7 @@ nfs_file_fsync(struct file *file, int datasync)
have_error |= test_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags);
if (have_error)
ret = xchg(&ctx->error, 0);
- if (!ret)
+ if (!ret && status < 0)
ret = status;
return ret;
}
--
1.7.2.1

2010-08-16 16:36:47

by Bill Davidsen

[permalink] [raw]
Subject: Re: nfs regression 2.6.35+

Takashi Iwai wrote:
> At Mon, 16 Aug 2010 12:09:12 +0200, Takashi Iwai wrote:
>> At Mon, 16 Aug 2010 15:06:26 +0800,
>> Shaohua Li wrote:
>>> NFS client runs latest git. At client side, use vim to edit a file located at
>>> NFS server. If I save the file, vim always reports 'E667: Fsync failed'. If I
>>> revert f7fa16506bf9b6323e862a61e14c20555152bb3, vim works. No kernel errors
>>> reported.
>> This hits me, too. Reverting it cures the problem.
>> (BTW, the correct commit id of the affecting patch is
>> af7fa16506bf9b6323e862a61e14c20555152bb3
>> "NFS: Fix up the fsync code")
>>
>> Reproduced on 2.6.36-rc1.
>>
>> Looking at strace output,
>>
>> open("afo", O_WRONLY|O_CREAT|O_TRUNC, 0666) = 4
>> write(4, "#!/bin\n", 7) = 7
>> fsync(4) = 1
>> stat("afo", {st_mode=S_IFREG|0644, st_size=7, ...}) = 0
>> close(4) = 0
>>
>> So, fsync() returns 1 wrongly.
>
> How about a band-aid fix below?
>
Your band-aid sticks for me.

>
> Takashi
>
>
> From c75eab5ac47f5ce27a0d450423f8c46824f832f0 Mon Sep 17 00:00:00 2001
> From: Takashi Iwai <[email protected]>
> Date: Mon, 16 Aug 2010 12:25:19 +0200
> Subject: [PATCH] NFS: fix fsync return code
>
> With the commit af7fa16506bf9b6323e862a61e14c20555152bb3
> NFS: Fix up the fsync code
> fsync returns a postive number for success incorrectly because now it
> calls nfs_commit_inode() which returns the number of pages.
>
> This patch makes fsync simply ignore a positive return value.
>
> Signed-off-by: Takashi Iwai <[email protected]>
> ---
> fs/nfs/file.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/nfs/file.c b/fs/nfs/file.c
> index 2d141a7..eb51bd6 100644
> --- a/fs/nfs/file.c
> +++ b/fs/nfs/file.c
> @@ -323,7 +323,7 @@ nfs_file_fsync(struct file *file, int datasync)
> have_error |= test_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags);
> if (have_error)
> ret = xchg(&ctx->error, 0);
> - if (!ret)
> + if (!ret && status < 0)
> ret = status;
> return ret;
> }


--
Bill Davidsen <[email protected]>
"We have more to fear from the bungling of the incompetent than from
the machinations of the wicked." - from Slashdot

2010-08-16 18:18:25

by Nick Bowler

[permalink] [raw]
Subject: Re: nfs regression 2.6.35+

On 2010-08-16 12:40 +0200, Takashi Iwai wrote:
> At Mon, 16 Aug 2010 12:09:12 +0200, Takashi Iwai wrote:
> > This hits me, too. Reverting it cures the problem.
> > (BTW, the correct commit id of the affecting patch is
> > af7fa16506bf9b6323e862a61e14c20555152bb3
> > "NFS: Fix up the fsync code")
> >
> > Reproduced on 2.6.36-rc1.
> >
> > So, fsync() returns 1 wrongly.

Apparently this breaks NFS file locks as well:

fetchmail: starting fetchmail 6.3.17 daemon
/home/nbowler/.fetchmail.pid: Bad file descriptor
fetchmail: lock creation failed.

> How about a band-aid fix below?
[...]
> Subject: [PATCH] NFS: fix fsync return code

and this fixes all the problems for me.

--
Nick Bowler, Elliptic Technologies (http://www.elliptictech.com/)

2010-08-16 22:48:01

by Myklebust, Trond

[permalink] [raw]
Subject: Re: nfs regression 2.6.35+

On Mon, 2010-08-16 at 15:06 +0800, Shaohua Li wrote:
> NFS client runs latest git. At client side, use vim to edit a file located at
> NFS server. If I save the file, vim always reports 'E667: Fsync failed'. If I
> revert f7fa16506bf9b6323e862a61e14c20555152bb3, vim works. No kernel errors
> reported.
>
> Thanks,
> Shaohua
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

There is already a fix for this in the linux-next tree and in the
'bugfixes' branch of
git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git: see commit
0702099bd86c33c2dcdbd3963433a61f3f503901 (NFS: fix the return value of
nfs_file_fsync()).

I haven't pushed it to Linus yet due to excessive travel this past week.
Will do so soon.

Cheers
Trond

----------------------------------------------------------------------------------------
commit 0702099bd86c33c2dcdbd3963433a61f3f503901
Author: J. R. Okajima <[email protected]>
Date: Wed Aug 11 13:10:16 2010 -0400

NFS: fix the return value of nfs_file_fsync()

By the commit af7fa16 2010-08-03 NFS: Fix up the fsync code
close(2) became returning the non-zero value even if it went well.
nfs_file_fsync() should return 0 when "status" is positive.

Signed-off-by: J. R. Okajima <[email protected]>
Signed-off-by: Trond Myklebust <[email protected]>

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 2d141a7..eb51bd6 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -323,7 +323,7 @@ nfs_file_fsync(struct file *file, int datasync)
have_error |= test_bit(NFS_CONTEXT_ERROR_WRITE, &ctx->flags);
if (have_error)
ret = xchg(&ctx->error, 0);
- if (!ret)
+ if (!ret && status < 0)
ret = status;
return ret;
}