summaryrefslogtreecommitdiff
path: root/fs/nfsd/nfs4proc.c
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2014-03-29 10:23:47 +0800
committerJ. Bruce Fields <bfields@redhat.com>2014-03-30 10:47:34 -0400
commit2336745e87a646a3dc9570f082b85df519ee523e (patch)
tree70975174a7fe3e0be2f5b07d06590e4190af6865 /fs/nfsd/nfs4proc.c
parenta8a7c6776f8d74780348bef639581421d85a4376 (diff)
downloadlinux-exynos-2336745e87a646a3dc9570f082b85df519ee523e.tar.gz
linux-exynos-2336745e87a646a3dc9570f082b85df519ee523e.tar.bz2
linux-exynos-2336745e87a646a3dc9570f082b85df519ee523e.zip
NFSD: Clear wcc data between compound ops
Testing NFS4.0 by pynfs, I got some messeages as, "nfsd: inode locked twice during operation." When one compound RPC contains two or more ops that locks the filehandle,the second op will cause the message. As two SETATTR ops, after the first SETATTR, nfsd will not call fh_put() to release current filehandle, it means filehandle have unlocked with fh_post_saved = 1. The second SETATTR find fh_post_saved = 1, and printk the message. v2: introduce helper fh_clear_wcc(). Signed-off-by: Kinglong Mee <kinglongmee@gmail.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
-rw-r--r--fs/nfsd/nfs4proc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 9c23696bf36b..d543222babf3 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1358,6 +1358,8 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
goto encode_op;
}
+ fh_clear_wcc(current_fh);
+
/* If op is non-idempotent */
if (opdesc->op_flags & OP_MODIFIES_SOMETHING) {
plen = opdesc->op_rsize_bop(rqstp, op);