Commit d49f042a authored Oct 28, 2013 by Trond Myklebust

NFSv4: Fix state reference counting in _nfs4_opendata_reclaim_to_nfs4_state

Currently, if the call to nfs_refresh_inode fails, then we end up leaking
a reference count, due to the call to nfs4_get_open_state.
While we're at it, replace nfs4_get_open_state with a simple call to
atomic_inc(); there is no need to do a full lookup of the struct nfs_state
since it is passed as an argument in the struct nfs4_opendata, and
is already assigned to the variable 'state'.

Cc: stable@vger.kernel.org # 3.7.x: a43ec98b: NFSv4: don't fail on missing
Cc: stable@vger.kernel.org # 3.7.x
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent a43ec98b

fs/nfs/nfs4proc.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -1323,11 +1323,6 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
		goto err;
		}

		ret = -ENOMEM;
		state = nfs4_get_open_state(inode, data->owner);
		if (state == NULL)
		goto err;

		ret = nfs_refresh_inode(inode, &data->f_attr);
		if (ret)
		goto err;
		@@ -1336,6 +1331,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
		nfs4_opendata_check_deleg(data, state);
		update_open_stateid(state, &data->o_res.stateid, NULL,
		data->o_arg.fmode);
		atomic_inc(&state->count);

		return state;
		err:

Admin message