Commit ed056764 authored by Jeff Layton's avatar Jeff Layton
Browse files

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



This reverts commit db2efec0.

William reported that he was seeing instability with this patch, which
is likely due to the fact that it can cause the kernel to take a new
reference to a filp after the last reference has already been put.

Revert this patch for now, as we'll need to fix this in another way.

Cc: stable@vger.kernel.org
Reported-by: default avatarWilliam Dauchy <william@gandi.net>
Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
Reviewed-by: default avatar"J. Bruce Fields" <bfields@fieldses.org>
Tested-by: default avatar"J. Bruce Fields" <bfields@fieldses.org>
parent b9243b5a

fs/nfs/nfs4proc.c

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

	atomic_inc(&lsp->ls_count);

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

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

	p->ctx = get_nfs_open_context(ctx);

	p->ctx = get_nfs_open_context(ctx);

	get_file(fl->fl_file);

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

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

	p->server = NFS_SERVER(inode);

	p->server = NFS_SERVER(inode);

	return p;

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

	nfs_free_seqid(calldata->arg.seqid);

	nfs4_put_lock_state(calldata->lsp);

	nfs4_put_lock_state(calldata->lsp);

	put_nfs_open_context(calldata->ctx);

	put_nfs_open_context(calldata->ctx);

	fput(calldata->fl.fl_file);

	kfree(calldata);

	kfree(calldata);

}

}