Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f6ce8e7 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

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 baeb4ff0 (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: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent e560e3b5

fs/nfsd/nfs4state.c

+0 −2
Original line number Diff line number Diff line
@@ -2970,8 +2970,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);