diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-08 16:58:09 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-08 17:08:42 +0200 |
| commit | 2d0dbc6ae8a5194aaecb9cfffb9053f38fce8b86 (patch) | |
| tree | b29655eb58107bc9e1413b86e68d35c8de3806cd /fs/nfs | |
| parent | NFSv4.1: Convert another trivial printk into a dprintk (diff) | |
| download | linux-2d0dbc6ae8a5194aaecb9cfffb9053f38fce8b86.tar.xz linux-2d0dbc6ae8a5194aaecb9cfffb9053f38fce8b86.zip | |
NFSv4: Fix unnecessary delegation returns in nfs4_do_open
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>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/nfs')
| -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 5881f2cc5d81..f23977e4ac0f 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1902,6 +1902,7 @@ static struct nfs4_state *nfs4_do_open(struct inode *dir, struct nfs4_state *res; int status; + fmode &= FMODE_READ|FMODE_WRITE; do { status = _nfs4_do_open(dir, dentry, fmode, flags, sattr, cred, &res, ctx_th); |