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

Commit ca2e3cdc authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFSv4: Convert struct nfs4_state to use refcount_t 



[ Upstream commit ace9fad43aa60a88af4b57a8328f0958e3d07bf0 ]

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Stable-dep-of: 6165a16a5ad9 ("NFSv4: Fix hangs when recovering open state after a server reboot")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c65a5e3b

fs/nfs/nfs4_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ struct nfs4_state { 
	unsigned int n_wronly;		/* Number of write-only references */

	unsigned int n_rdwr;		/* Number of read/write references */

	fmode_t state;			/* State on the server (R,W, or RW) */

	atomic_t count;

	refcount_t count;



	wait_queue_head_t waitq;

};

fs/nfs/nfs4proc.c

+4 −4
Original line number Diff line number Diff line
@@ -1792,7 +1792,7 @@ static struct nfs4_state *nfs4_try_open_cached(struct nfs4_opendata *opendata) 
out:

	return ERR_PTR(ret);

out_return_state:

	atomic_inc(&state->count);

	refcount_inc(&state->count);

	return state;

}
@@ -1864,7 +1864,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) 
update:

	update_open_stateid(state, &data->o_res.stateid, NULL,

			    data->o_arg.fmode);

	atomic_inc(&state->count);

	refcount_inc(&state->count);



	return state;

}
@@ -1902,7 +1902,7 @@ nfs4_opendata_find_nfs4_state(struct nfs4_opendata *data) 
		return ERR_CAST(inode);

	if (data->state != NULL && data->state->inode == inode) {

		state = data->state;

		atomic_inc(&state->count);

		refcount_inc(&state->count);

	} else

		state = nfs4_get_open_state(inode, data->owner);

	iput(inode);
@@ -1975,7 +1975,7 @@ static struct nfs4_opendata *nfs4_open_recoverdata_alloc(struct nfs_open_context 
	if (opendata == NULL)

		return ERR_PTR(-ENOMEM);

	opendata->state = state;

	atomic_inc(&state->count);

	refcount_inc(&state->count);

	return opendata;

}

fs/nfs/nfs4state.c

+4 −4
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ nfs4_alloc_open_state(void) 
	state = kzalloc(sizeof(*state), GFP_NOFS);

	if (!state)

		return NULL;

	atomic_set(&state->count, 1);

	refcount_set(&state->count, 1);

	INIT_LIST_HEAD(&state->lock_states);

	spin_lock_init(&state->state_lock);

	seqlock_init(&state->seqlock);
@@ -709,7 +709,7 @@ __nfs4_find_state_byowner(struct inode *inode, struct nfs4_state_owner *owner) 
			continue;

		if (!nfs4_valid_open_stateid(state))

			continue;

		if (atomic_inc_not_zero(&state->count))

		if (refcount_inc_not_zero(&state->count))

			return state;

	}

	return NULL;
@@ -763,7 +763,7 @@ void nfs4_put_open_state(struct nfs4_state *state) 
	struct inode *inode = state->inode;

	struct nfs4_state_owner *owner = state->owner;



	if (!atomic_dec_and_lock(&state->count, &owner->so_lock))

	if (!refcount_dec_and_lock(&state->count, &owner->so_lock))

		return;

	spin_lock(&inode->i_lock);

	list_del(&state->inode_states);
@@ -1596,7 +1596,7 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs 
			continue;

		if (state->state == 0)

			continue;

		atomic_inc(&state->count);

		refcount_inc(&state->count);

		spin_unlock(&sp->so_lock);

		status = ops->recover_open(sp, state);

		if (status >= 0) {