| Message ID | 20211224035243.56554-1-jefflexu@linux.alibaba.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for,5.15.y] netfs: fix parameter of cleanup() | expand |
On Fri, Dec 24, 2021 at 11:52:43AM +0800, Jeffle Xu wrote: > commit 3cfef1b612e15a0c2f5b1c9d3f3f31ad72d56fcd upstream. > > 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: 3d3c95046742 ("netfs: Provide readahead and readpage netfs helpers") > Fixes: e1b1240c1ff5 ("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 > --- > fs/netfs/read_helper.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Now queued up, thanks, greg k-h
diff --git a/fs/netfs/read_helper.c b/fs/netfs/read_helper.c index 4b54529f8176..242f8bcb34a4 100644 --- a/fs/netfs/read_helper.c +++ b/fs/netfs/read_helper.c @@ -958,7 +958,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, page_file_mapping(page)); + ops->cleanup(page_file_mapping(page), netfs_priv); unlock_page(page); return -ENOMEM; } @@ -1185,7 +1185,7 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, goto error; have_page_no_wait: if (netfs_priv) - ops->cleanup(netfs_priv, mapping); + ops->cleanup(mapping, netfs_priv); *_page = page; _leave(" = 0"); return 0; @@ -1196,7 +1196,7 @@ int netfs_write_begin(struct file *file, struct address_space *mapping, unlock_page(page); put_page(page); if (netfs_priv) - ops->cleanup(netfs_priv, mapping); + ops->cleanup(mapping, netfs_priv); _leave(" = %d", ret); return ret; }
commit 3cfef1b612e15a0c2f5b1c9d3f3f31ad72d56fcd upstream. 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: 3d3c95046742 ("netfs: Provide readahead and readpage netfs helpers") Fixes: e1b1240c1ff5 ("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 --- fs/netfs/read_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)