Skip to content

Commit

Permalink
netfs: fix parameter of cleanup()
Browse files Browse the repository at this point in the history
The order of these two parameters is just reversed. gcc didn't warn on
that, probably because 'void *' can be converted from or to other
pointer types without warning.

Cc: stable@vger.kernel.org
Fixes: 3d3c950 ("netfs: Provide readahead and readpage netfs helpers")
Fixes: e1b1240 ("netfs: Add write_begin helper")
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Link: https://lore.kernel.org/r/20211207031449.100510-1-jefflexu@linux.alibaba.com/ # v1
  • Loading branch information
Jeffle Xu authored and David Howells committed Dec 7, 2021
1 parent 598ad0b commit 3cfef1b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs/netfs/read_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ int netfs_readpage(struct file *file,
rreq = netfs_alloc_read_request(ops, netfs_priv, file);
if (!rreq) {
if (netfs_priv)
ops->cleanup(netfs_priv, folio_file_mapping(folio));
ops->cleanup(folio_file_mapping(folio), netfs_priv);
folio_unlock(folio);
return -ENOMEM;
}
Expand Down Expand Up @@ -1186,7 +1186,7 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,
goto error;
have_folio_no_wait:
if (netfs_priv)
ops->cleanup(netfs_priv, mapping);
ops->cleanup(mapping, netfs_priv);
*_folio = folio;
_leave(" = 0");
return 0;
Expand All @@ -1197,7 +1197,7 @@ int netfs_write_begin(struct file *file, struct address_space *mapping,
folio_unlock(folio);
folio_put(folio);
if (netfs_priv)
ops->cleanup(netfs_priv, mapping);
ops->cleanup(mapping, netfs_priv);
_leave(" = %d", ret);
return ret;
}
Expand Down

0 comments on commit 3cfef1b

Please sign in to comment.