mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-24 09:13:20 -05:00
Code Activity

NFS: replace usage of found with dedicated list iterator variable

Browse source 
To move the list iterator variable into the list_for_each_entry_*()
macro in the future it should be avoided to use the list iterator
variable after the loop body.

To *never* use the list iterator variable after the loop it was
concluded to use a separate iterator variable instead of a
found boolean [1].

This removes the need to use a found variable and simply checking if
the variable was set, can determine if the break/goto was hit.

Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/
Signed-off-by: Jakob Koschel <jakobkoschel@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Jakob Koschel 2022-03-24 08:15:23 +01:00 • committed by Trond Myklebust
parent 3848e96edf
commit 3de24f3d70
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs/nfs/nfs42proc.c
View file

@ -175,9 +175,8 @@ static int handle_async_copy(struct nfs42_copy_res *res,
nfs4_stateid *src_stateid, nfs4_stateid *src_stateid,
bool *restart) bool *restart)
{ {
struct nfs4_copy_state *copy, *tmp_copy; struct nfs4_copy_state *copy, *tmp_copy = NULL, *iter;
int status = NFS4_OK; int status = NFS4_OK;
bool found_pending = false;
struct nfs_open_context *dst_ctx = nfs_file_open_context(dst); struct nfs_open_context *dst_ctx = nfs_file_open_context(dst);
struct nfs_open_context *src_ctx = nfs_file_open_context(src); struct nfs_open_context *src_ctx = nfs_file_open_context(src);
@ -186,17 +185,17 @@ static int handle_async_copy(struct nfs42_copy_res *res,
return -ENOMEM; return -ENOMEM;
spin_lock(&dst_server->nfs_client->cl_lock); spin_lock(&dst_server->nfs_client->cl_lock);
list_for_each_entry(tmp_copy, list_for_each_entry(iter,
&dst_server->nfs_client->pending_cb_stateids, &dst_server->nfs_client->pending_cb_stateids,
copies) { copies) {
if (memcmp(&res->write_res.stateid, &tmp_copy->stateid, if (memcmp(&res->write_res.stateid, &iter->stateid,
NFS4_STATEID_SIZE)) NFS4_STATEID_SIZE))
continue; continue;
found_pending = true; tmp_copy = iter;
list_del(&tmp_copy->copies); list_del(&iter->copies);
break; break;
} }
if (found_pending) { if (tmp_copy) {
spin_unlock(&dst_server->nfs_client->cl_lock); spin_unlock(&dst_server->nfs_client->cl_lock);
kfree(copy); kfree(copy);
copy = tmp_copy; copy = tmp_copy;