| Message ID | 1406137609-24466-1-git-send-email-jlayton@primarydata.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jul 23, 2014 at 01:46:49PM -0400, Jeff Layton wrote: > 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. Thanks, applied.--b. > > Signed-off-by: Jeff Layton <jlayton@primarydata.com> > --- > fs/nfsd/nfs4state.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 72da0d44e66b..ce07e9517a80 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -2968,8 +2968,6 @@ static void init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp, > stp->st_file = fp; > stp->st_access_bmap = 0; > stp->st_deny_bmap = 0; > - set_access(open->op_share_access, stp); > - set_deny(open->op_share_deny, stp); > stp->st_openstp = NULL; > spin_lock(&fp->fi_lock); > list_add(&stp->st_perfile, &fp->fi_stateids); > -- > 1.9.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 72da0d44e66b..ce07e9517a80 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2968,8 +2968,6 @@ static void init_open_stateid(struct nfs4_ol_stateid *stp, struct nfs4_file *fp, stp->st_file = fp; stp->st_access_bmap = 0; stp->st_deny_bmap = 0; - set_access(open->op_share_access, stp); - set_deny(open->op_share_deny, stp); stp->st_openstp = NULL; spin_lock(&fp->fi_lock); list_add(&stp->st_perfile, &fp->fi_stateids);
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> --- fs/nfsd/nfs4state.c | 2 -- 1 file changed, 2 deletions(-)