diff options
author | Jeff Layton <jlayton@primarydata.com> | 2014-07-23 13:46:49 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2014-07-23 14:20:47 -0400 |
commit | 2f6ce8e73caa443201e3d826639b9242cf6ea568 (patch) | |
tree | 7932c333d008c0cd91d5e38cb8954b2bfbda461d | |
parent | e560e3b510d22e06081a72a4d49e559b9e392659 (diff) |
nfsd: ensure that st_access_bmap and st_deny_bmap are initialized to 0
Open stateids must be initialized with the st_access_bmap and
st_deny_bmap set to 0, so that nfs4_get_vfs_file can properly record
their state in old_access_bmap and old_deny_bmap.
This bug was introduced in commit baeb4ff0e502 (nfsd: make deny mode
enforcement more efficient and close races in it) and was causing the
refcounts to end up incorrect when nfs4_get_vfs_file returned an error
after bumping the refcounts. This made it impossible to unmount the
underlying filesystem after running pynfs tests that involve deny modes.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index a3a828d17563..66a3b843a82b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -2970,8 +2970,6 @@ static void init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp, | |||
2970 | stp->st_file = fp; | 2970 | stp->st_file = fp; |
2971 | stp->st_access_bmap = 0; | 2971 | stp->st_access_bmap = 0; |
2972 | stp->st_deny_bmap = 0; | 2972 | stp->st_deny_bmap = 0; |
2973 | set_access(open->op_share_access, stp); | ||
2974 | set_deny(open->op_share_deny, stp); | ||
2975 | stp->st_openstp = NULL; | 2973 | stp->st_openstp = NULL; |
2976 | spin_lock(&fp->fi_lock); | 2974 | spin_lock(&fp->fi_lock); |
2977 | list_add(&stp->st_perfile, &fp->fi_stateids); | 2975 | list_add(&stp->st_perfile, &fp->fi_stateids); |