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

Commit 7b587e1a authored by NeilBrown's avatar NeilBrown Committed by Jeff Layton
Browse files

NFS: use locks_copy_lock() to copy locks. 



Using memcpy() to copy lock requests leaves the various
list_head in an inconsistent state.
As we will soon attach a list of conflicting request to
another pending request, we need these lists to be consistent.
So change NFS to use locks_init_lock/locks_copy_lock instead
of memcpy.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Reviewed-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
parent ad6bbd8b

fs/nfs/nfs4proc.c

+4 −2
Original line number Diff line number Diff line
@@ -6311,7 +6311,8 @@ static struct nfs4_unlockdata *nfs4_alloc_unlockdata(struct file_lock *fl, 
	/* Ensure we don't close file until we're done freeing locks! */

	p->ctx = get_nfs_open_context(ctx);

	p->l_ctx = nfs_get_lock_context(ctx);

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

	locks_init_lock(&p->fl);

	locks_copy_lock(&p->fl, fl);

	p->server = NFS_SERVER(inode);

	return p;

}
@@ -6533,7 +6534,8 @@ static struct nfs4_lockdata *nfs4_alloc_lockdata(struct file_lock *fl, 
	p->server = server;

	refcount_inc(&lsp->ls_count);

	p->ctx = get_nfs_open_context(ctx);

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

	locks_init_lock(&p->fl);

	locks_copy_lock(&p->fl, fl);

	return p;

out_free_seqid:

	nfs_free_seqid(p->arg.open_seqid);