[ 37/69] NFSv4: Fix unnecessary delegation returns in nfs4_do_open
From: Ben Hutchings <hidden>
Date: 2012-06-17 18:28:59
Also in:
lkml
From: Ben Hutchings <hidden>
Date: 2012-06-17 18:28:59
Also in:
lkml
3.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Trond Myklebust <redacted> 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 <redacted> Signed-off-by: Trond Myklebust <redacted> Signed-off-by: Ben Hutchings <redacted> --- fs/nfs/nfs4proc.c | 1 + 1 file changed, 1 insertion(+)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c@@ -1825,6 +1825,7 @@ 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)