diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-08 10:58:09 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-22 11:36:54 -0700 |
| commit | 5e74cfe1feb56745cecce815adf6fd2c7dfb6a58 (patch) | |
| tree | 9057b07d5378285f5d650e0f0f1582915317ac7b | |
| parent | 5f1d81e9fb6c05e8ab89a610bb63cdc8f0f66d81 (diff) | |
| download | linux-stable-5e74cfe1feb56745cecce815adf6fd2c7dfb6a58.tar.gz linux-stable-5e74cfe1feb56745cecce815adf6fd2c7dfb6a58.tar.bz2 linux-stable-5e74cfe1feb56745cecce815adf6fd2c7dfb6a58.zip | |
NFSv4: Fix unnecessary delegation returns in nfs4_do_open
commit 2d0dbc6ae8a5194aaecb9cfffb9053f38fce8b86 upstream.
While nfs4_do_open() expects the fmode argument to be restricted to
combinations of FMODE_READ and FMODE_WRITE, both nfs4_atomic_open()
and nfs4_proc_create will pass the nfs_open_context->mode,
which contains the full fmode_t.
This patch ensures that nfs4_do_open strips the other fmode_t bits,
fixing a problem in which the nfs4_do_open call would result in an
unnecessary delegation return.
Reported-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/nfs/nfs4proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index e9b1eb701a01..d60c2d870ab0 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1861,6 +1861,7 @@ static struct nfs4_state *nfs4_do_open(struct inode *dir, struct dentry *dentry, struct nfs4_state *res; int status; + fmode &= FMODE_READ|FMODE_WRITE; do { status = _nfs4_do_open(dir, dentry, fmode, flags, sattr, cred, &res); if (status == 0) |