2013-07-23 04:05:22

by Harshula

Subject: [PATCH] nfsd: nfs4_file_get_access: need to be more careful with O_RDWR

If fi_fds = {non-NULL, NULL, non-NULL} and oflag = O_WRONLY
the WARN_ON_ONCE(!(fp->fi_fds[oflag] || fp->fi_fds[O_RDWR]))
doesn't trigger when it should.

Signed-off-by: Harshula Jayasuriya <[email protected]>
---
fs/nfsd/nfs4state.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 280acef..1cb6211 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -282,19 +282,14 @@ static unsigned int file_hashval(struct inode *ino)

static struct hlist_head file_hashtbl[FILE_HASH_SIZE];

-static void __nfs4_file_get_access(struct nfs4_file *fp, int oflag)
-{
- WARN_ON_ONCE(!(fp->fi_fds[oflag] || fp->fi_fds[O_RDWR]));
- atomic_inc(&fp->fi_access[oflag]);
-}
-
static void nfs4_file_get_access(struct nfs4_file *fp, int oflag)
{
+ WARN_ON_ONCE(!fp->fi_fds[oflag]);
if (oflag == O_RDWR) {
- __nfs4_file_get_access(fp, O_RDONLY);
- __nfs4_file_get_access(fp, O_WRONLY);
+ atomic_inc(&fp->fi_access[O_RDONLY]);
+ atomic_inc(&fp->fi_access[O_WRONLY]);
} else
- __nfs4_file_get_access(fp, oflag);
+ atomic_inc(&fp->fi_access[oflag]);
}

static void nfs4_file_put_fd(struct nfs4_file *fp, int oflag)
--
1.8.1.4

2013-07-23 16:28:14

by J.Bruce Fields

Subject: Re: [PATCH] nfsd: nfs4_file_get_access: need to be more careful with O_RDWR

Thanks, applying for 3.12.--b.

On Tue, Jul 23, 2013 at 02:05:14PM +1000, Harshula Jayasuriya wrote:
> If fi_fds = {non-NULL, NULL, non-NULL} and oflag = O_WRONLY
> the WARN_ON_ONCE(!(fp->fi_fds[oflag] || fp->fi_fds[O_RDWR]))
> doesn't trigger when it should.
>
> Signed-off-by: Harshula Jayasuriya <[email protected]>
> ---
> fs/nfsd/nfs4state.c | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 280acef..1cb6211 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -282,19 +282,14 @@ static unsigned int file_hashval(struct inode *ino)
>
> static struct hlist_head file_hashtbl[FILE_HASH_SIZE];
>
> -static void __nfs4_file_get_access(struct nfs4_file *fp, int oflag)
> -{
> - WARN_ON_ONCE(!(fp->fi_fds[oflag] || fp->fi_fds[O_RDWR]));
> - atomic_inc(&fp->fi_access[oflag]);
> -}
> -
> static void nfs4_file_get_access(struct nfs4_file *fp, int oflag)
> {
> + WARN_ON_ONCE(!fp->fi_fds[oflag]);
> if (oflag == O_RDWR) {
> - __nfs4_file_get_access(fp, O_RDONLY);
> - __nfs4_file_get_access(fp, O_WRONLY);
> + atomic_inc(&fp->fi_access[O_RDONLY]);
> + atomic_inc(&fp->fi_access[O_WRONLY]);
> } else
> - __nfs4_file_get_access(fp, oflag);
> + atomic_inc(&fp->fi_access[oflag]);
> }
>
> static void nfs4_file_put_fd(struct nfs4_file *fp, int oflag)
> --
> 1.8.1.4
>