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

Commit 2514b961 authored by Sasha Levin's avatar Sasha Levin
Browse files

Revert "nfs: take extra reference to fl->fl_file when running a LOCKU operation" 



This reverts commit ed7f7f14.

Reverting from stable tree as fix was found to be buggy. New fix pending.

Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent b3ba162c

fs/nfs/nfs4proc.c

+0 −2
Original line number Diff line number Diff line
@@ -5356,7 +5356,6 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl, 
	atomic_inc(&lsp->ls_count);

	/* Ensure we don't close file until we're done freeing locks! */

	p->ctx = get_nfs_open_context(ctx);

	get_file(fl->fl_file);

	memcpy(&p->fl, fl, sizeof(p->fl));

	p->server = NFS_SERVER(inode);

	return p;
@@ -5368,7 +5367,6 @@ static void nfs4_locku_release_calldata(void *data) 
	nfs_free_seqid(calldata->arg.seqid);

	nfs4_put_lock_state(calldata->lsp);

	put_nfs_open_context(calldata->ctx);

	fput(calldata->fl.fl_file);

	kfree(calldata);

}