As the ->init() netfs op is now used to set up the netfslib I/O request
rather than passing stuff in, thereby allowing the netfslib functions to be
pointed at directly by the address_space_operations struct, we're always
going to be able to pass an I/O request pointer to the cleanup function.
Therefore, change the ->cleanup() function to take a pointer to the I/O
request rather than taking a pointer to the network filesystem's
address_space and a piece of private data.
Also, rename ->cleanup() to ->free_request() to match the ->init_request()
function.
Signed-off-by: David Howells <[email protected]>
cc: Jeff Layton <[email protected]>
cc: Steve French <[email protected]>
cc: Dominique Martinet <[email protected]>
cc: Jeff Layton <[email protected]>
cc: David Wysochanski <[email protected]>
cc: Ilya Dryomov <[email protected]>
cc: [email protected]
cc: [email protected]
cc: [email protected]
cc: [email protected]
cc: [email protected]
cc: [email protected]
---
fs/9p/vfs_addr.c | 11 +++++------
fs/afs/file.c | 6 +++---
fs/ceph/addr.c | 9 ++++-----
fs/netfs/objects.c | 8 +++++---
include/linux/netfs.h | 4 +++-
5 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index 501128188343..002c482794dc 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -66,13 +66,12 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file)
}
/**
- * v9fs_req_cleanup - Cleanup request initialized by v9fs_init_request
- * @mapping: unused mapping of request to cleanup
- * @priv: private data to cleanup, a fid, guaranted non-null.
+ * v9fs_free_request - Cleanup request initialized by v9fs_init_rreq
+ * @rreq: The I/O request to clean up
*/
-static void v9fs_req_cleanup(struct address_space *mapping, void *priv)
+static void v9fs_free_request(struct netfs_io_request *rreq)
{
- struct p9_fid *fid = priv;
+ struct p9_fid *fid = rreq->netfs_priv;
p9_client_clunk(fid);
}
@@ -94,9 +93,9 @@ static int v9fs_begin_cache_operation(struct netfs_io_request *rreq)
const struct netfs_request_ops v9fs_req_ops = {
.init_request = v9fs_init_request,
+ .free_request = v9fs_free_request,
.begin_cache_operation = v9fs_begin_cache_operation,
.issue_read = v9fs_issue_read,
- .cleanup = v9fs_req_cleanup,
};
/**
diff --git a/fs/afs/file.c b/fs/afs/file.c
index 26292a110a8f..b9ca72fbbcf9 100644
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -383,17 +383,17 @@ static int afs_check_write_begin(struct file *file, loff_t pos, unsigned len,
return test_bit(AFS_VNODE_DELETED, &vnode->flags) ? -ESTALE : 0;
}
-static void afs_priv_cleanup(struct address_space *mapping, void *netfs_priv)
+static void afs_free_request(struct netfs_io_request *rreq)
{
- key_put(netfs_priv);
+ key_put(rreq->netfs_priv);
}
const struct netfs_request_ops afs_req_ops = {
.init_request = afs_init_request,
+ .free_request = afs_free_request,
.begin_cache_operation = afs_begin_cache_operation,
.check_write_begin = afs_check_write_begin,
.issue_read = afs_issue_read,
- .cleanup = afs_priv_cleanup,
};
int afs_write_inode(struct inode *inode, struct writeback_control *wbc)
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index b6edcf89a429..ee8c1b099c4f 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -392,11 +392,10 @@ static int ceph_init_request(struct netfs_io_request *rreq, struct file *file)
return 0;
}
-static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)
+static void ceph_netfs_free_request(struct netfs_io_request *rreq)
{
- struct inode *inode = mapping->host;
- struct ceph_inode_info *ci = ceph_inode(inode);
- int got = (uintptr_t)priv;
+ struct ceph_inode_info *ci = ceph_inode(rreq->inode);
+ int got = (uintptr_t)rreq->netfs_priv;
if (got)
ceph_put_cap_refs(ci, got);
@@ -404,12 +403,12 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)
const struct netfs_request_ops ceph_netfs_ops = {
.init_request = ceph_init_request,
+ .free_request = ceph_netfs_free_request,
.begin_cache_operation = ceph_begin_cache_operation,
.issue_read = ceph_netfs_issue_read,
.expand_readahead = ceph_netfs_expand_readahead,
.clamp_length = ceph_netfs_clamp_length,
.check_write_begin = ceph_netfs_check_write_begin,
- .cleanup = ceph_readahead_cleanup,
};
#ifdef CONFIG_CEPH_FSCACHE
diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c
index e86107b30ba4..d6b8c0cbeb7c 100644
--- a/fs/netfs/objects.c
+++ b/fs/netfs/objects.c
@@ -75,10 +75,10 @@ static void netfs_free_request(struct work_struct *work)
struct netfs_io_request *rreq =
container_of(work, struct netfs_io_request, work);
- netfs_clear_subrequests(rreq, false);
- if (rreq->netfs_priv)
- rreq->netfs_ops->cleanup(rreq->mapping, rreq->netfs_priv);
trace_netfs_rreq(rreq, netfs_rreq_trace_free);
+ netfs_clear_subrequests(rreq, false);
+ if (rreq->netfs_ops->free_request)
+ rreq->netfs_ops->free_request(rreq);
if (rreq->cache_resources.ops)
rreq->cache_resources.ops->end_operation(&rreq->cache_resources);
kfree(rreq);
@@ -140,6 +140,8 @@ static void netfs_free_subrequest(struct netfs_io_subrequest *subreq,
struct netfs_io_request *rreq = subreq->rreq;
trace_netfs_sreq(subreq, netfs_sreq_trace_free);
+ if (rreq->netfs_ops->free_subrequest)
+ rreq->netfs_ops->free_subrequest(subreq);
kfree(subreq);
netfs_stat_d(&netfs_n_rh_sreq);
netfs_put_request(rreq, was_async, netfs_rreq_trace_put_subreq);
diff --git a/include/linux/netfs.h b/include/linux/netfs.h
index c7bf1eaf51d5..1970c21b4f80 100644
--- a/include/linux/netfs.h
+++ b/include/linux/netfs.h
@@ -204,7 +204,10 @@ struct netfs_io_request {
*/
struct netfs_request_ops {
int (*init_request)(struct netfs_io_request *rreq, struct file *file);
+ void (*free_request)(struct netfs_io_request *rreq);
+ void (*free_subrequest)(struct netfs_io_subrequest *rreq);
int (*begin_cache_operation)(struct netfs_io_request *rreq);
+
void (*expand_readahead)(struct netfs_io_request *rreq);
bool (*clamp_length)(struct netfs_io_subrequest *subreq);
void (*issue_read)(struct netfs_io_subrequest *subreq);
@@ -212,7 +215,6 @@ struct netfs_request_ops {
int (*check_write_begin)(struct file *file, loff_t pos, unsigned len,
struct folio *folio, void **_fsdata);
void (*done)(struct netfs_io_request *rreq);
- void (*cleanup)(struct address_space *mapping, void *netfs_priv);
};
/*
On 5/19/22 11:36 PM, Jeff Layton wrote:
> On Thu, 2022-05-19 at 15:16 +0100, David Howells wrote:
>> As the ->init() netfs op is now used to set up the netfslib I/O request
>> rather than passing stuff in, thereby allowing the netfslib functions to be
>> pointed at directly by the address_space_operations struct, we're always
>> going to be able to pass an I/O request pointer to the cleanup function.
>>
>> Therefore, change the ->cleanup() function to take a pointer to the I/O
>> request rather than taking a pointer to the network filesystem's
>> address_space and a piece of private data.
>>
>> Also, rename ->cleanup() to ->free_request() to match the ->init_request()
>> function.
>>
>> Signed-off-by: David Howells <[email protected]>
>> cc: Jeff Layton <[email protected]>
>> cc: Steve French <[email protected]>
>> cc: Dominique Martinet <[email protected]>
>> cc: Jeff Layton <[email protected]>
>> cc: David Wysochanski <[email protected]>
>> cc: Ilya Dryomov <[email protected]>
>> cc: [email protected]
>> cc: [email protected]
>> cc: [email protected]
>> cc: [email protected]
>> cc: [email protected]
>> cc: [email protected]
>> ---
>>
>> fs/9p/vfs_addr.c | 11 +++++------
>> fs/afs/file.c | 6 +++---
>> fs/ceph/addr.c | 9 ++++-----
>> fs/netfs/objects.c | 8 +++++---
>> include/linux/netfs.h | 4 +++-
>> 5 files changed, 20 insertions(+), 18 deletions(-)
>>
>> diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
>> index 501128188343..002c482794dc 100644
>> --- a/fs/9p/vfs_addr.c
>> +++ b/fs/9p/vfs_addr.c
>> @@ -66,13 +66,12 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file)
>> }
>>
>> /**
>> - * v9fs_req_cleanup - Cleanup request initialized by v9fs_init_request
>> - * @mapping: unused mapping of request to cleanup
>> - * @priv: private data to cleanup, a fid, guaranted non-null.
>> + * v9fs_free_request - Cleanup request initialized by v9fs_init_rreq
>> + * @rreq: The I/O request to clean up
>> */
>> -static void v9fs_req_cleanup(struct address_space *mapping, void *priv)
>> +static void v9fs_free_request(struct netfs_io_request *rreq)
>> {
>> - struct p9_fid *fid = priv;
>> + struct p9_fid *fid = rreq->netfs_priv;
>>
>> p9_client_clunk(fid);
>> }
>> @@ -94,9 +93,9 @@ static int v9fs_begin_cache_operation(struct netfs_io_request *rreq)
>>
>> const struct netfs_request_ops v9fs_req_ops = {
>> .init_request = v9fs_init_request,
>> + .free_request = v9fs_free_request,
>> .begin_cache_operation = v9fs_begin_cache_operation,
>> .issue_read = v9fs_issue_read,
>> - .cleanup = v9fs_req_cleanup,
>> };
>>
>> /**
>> diff --git a/fs/afs/file.c b/fs/afs/file.c
>> index 26292a110a8f..b9ca72fbbcf9 100644
>> --- a/fs/afs/file.c
>> +++ b/fs/afs/file.c
>> @@ -383,17 +383,17 @@ static int afs_check_write_begin(struct file *file, loff_t pos, unsigned len,
>> return test_bit(AFS_VNODE_DELETED, &vnode->flags) ? -ESTALE : 0;
>> }
>>
>> -static void afs_priv_cleanup(struct address_space *mapping, void *netfs_priv)
>> +static void afs_free_request(struct netfs_io_request *rreq)
>> {
>> - key_put(netfs_priv);
>> + key_put(rreq->netfs_priv);
>> }
>>
>> const struct netfs_request_ops afs_req_ops = {
>> .init_request = afs_init_request,
>> + .free_request = afs_free_request,
>> .begin_cache_operation = afs_begin_cache_operation,
>> .check_write_begin = afs_check_write_begin,
>> .issue_read = afs_issue_read,
>> - .cleanup = afs_priv_cleanup,
>> };
>>
>> int afs_write_inode(struct inode *inode, struct writeback_control *wbc)
>> diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
>> index b6edcf89a429..ee8c1b099c4f 100644
>> --- a/fs/ceph/addr.c
>> +++ b/fs/ceph/addr.c
>> @@ -392,11 +392,10 @@ static int ceph_init_request(struct netfs_io_request *rreq, struct file *file)
>> return 0;
>> }
>>
>> -static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)
>> +static void ceph_netfs_free_request(struct netfs_io_request *rreq)
>> {
>> - struct inode *inode = mapping->host;
>> - struct ceph_inode_info *ci = ceph_inode(inode);
>> - int got = (uintptr_t)priv;
>> + struct ceph_inode_info *ci = ceph_inode(rreq->inode);
>> + int got = (uintptr_t)rreq->netfs_priv;
>>
>> if (got)
>> ceph_put_cap_refs(ci, got);
>> @@ -404,12 +403,12 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)
>>
>> const struct netfs_request_ops ceph_netfs_ops = {
>> .init_request = ceph_init_request,
>> + .free_request = ceph_netfs_free_request,
>> .begin_cache_operation = ceph_begin_cache_operation,
>> .issue_read = ceph_netfs_issue_read,
>> .expand_readahead = ceph_netfs_expand_readahead,
>> .clamp_length = ceph_netfs_clamp_length,
>> .check_write_begin = ceph_netfs_check_write_begin,
>> - .cleanup = ceph_readahead_cleanup,
>> };
>>
>> #ifdef CONFIG_CEPH_FSCACHE
>> diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c
>> index e86107b30ba4..d6b8c0cbeb7c 100644
>> --- a/fs/netfs/objects.c
>> +++ b/fs/netfs/objects.c
>> @@ -75,10 +75,10 @@ static void netfs_free_request(struct work_struct *work)
>> struct netfs_io_request *rreq =
>> container_of(work, struct netfs_io_request, work);
>>
>> - netfs_clear_subrequests(rreq, false);
>> - if (rreq->netfs_priv)
>> - rreq->netfs_ops->cleanup(rreq->mapping, rreq->netfs_priv);
>> trace_netfs_rreq(rreq, netfs_rreq_trace_free);
>> + netfs_clear_subrequests(rreq, false);
>> + if (rreq->netfs_ops->free_request)
>> + rreq->netfs_ops->free_request(rreq);
>> if (rreq->cache_resources.ops)
>> rreq->cache_resources.ops->end_operation(&rreq->cache_resources);
>> kfree(rreq);
>> @@ -140,6 +140,8 @@ static void netfs_free_subrequest(struct netfs_io_subrequest *subreq,
>> struct netfs_io_request *rreq = subreq->rreq;
>>
>> trace_netfs_sreq(subreq, netfs_sreq_trace_free);
>> + if (rreq->netfs_ops->free_subrequest)
>> + rreq->netfs_ops->free_subrequest(subreq);
>> kfree(subreq);
>> netfs_stat_d(&netfs_n_rh_sreq);
>> netfs_put_request(rreq, was_async, netfs_rreq_trace_put_subreq);
>> diff --git a/include/linux/netfs.h b/include/linux/netfs.h
>> index c7bf1eaf51d5..1970c21b4f80 100644
>> --- a/include/linux/netfs.h
>> +++ b/include/linux/netfs.h
>> @@ -204,7 +204,10 @@ struct netfs_io_request {
>> */
>> struct netfs_request_ops {
>> int (*init_request)(struct netfs_io_request *rreq, struct file *file);
>> + void (*free_request)(struct netfs_io_request *rreq);
>> + void (*free_subrequest)(struct netfs_io_subrequest *rreq);
> Do we need free_subrequest? It looks like nothing defines it in this
> series.
If this is needed in future, or shall we do this in
netfs_clear_subrequests() ?
-- Xiubo
>> int (*begin_cache_operation)(struct netfs_io_request *rreq);
>> +
>> void (*expand_readahead)(struct netfs_io_request *rreq);
>> bool (*clamp_length)(struct netfs_io_subrequest *subreq);
>> void (*issue_read)(struct netfs_io_subrequest *subreq);
>> @@ -212,7 +215,6 @@ struct netfs_request_ops {
>> int (*check_write_begin)(struct file *file, loff_t pos, unsigned len,
>> struct folio *folio, void **_fsdata);
>> void (*done)(struct netfs_io_request *rreq);
>> - void (*cleanup)(struct address_space *mapping, void *netfs_priv);
>> };
>>
>> /*
>>
>>
On Thu, 2022-05-19 at 15:16 +0100, David Howells wrote:
> As the ->init() netfs op is now used to set up the netfslib I/O request
> rather than passing stuff in, thereby allowing the netfslib functions to be
> pointed at directly by the address_space_operations struct, we're always
> going to be able to pass an I/O request pointer to the cleanup function.
>
> Therefore, change the ->cleanup() function to take a pointer to the I/O
> request rather than taking a pointer to the network filesystem's
> address_space and a piece of private data.
>
> Also, rename ->cleanup() to ->free_request() to match the ->init_request()
> function.
>
> Signed-off-by: David Howells <[email protected]>
> cc: Jeff Layton <[email protected]>
> cc: Steve French <[email protected]>
> cc: Dominique Martinet <[email protected]>
> cc: Jeff Layton <[email protected]>
> cc: David Wysochanski <[email protected]>
> cc: Ilya Dryomov <[email protected]>
> cc: [email protected]
> cc: [email protected]
> cc: [email protected]
> cc: [email protected]
> cc: [email protected]
> cc: [email protected]
> ---
>
> fs/9p/vfs_addr.c | 11 +++++------
> fs/afs/file.c | 6 +++---
> fs/ceph/addr.c | 9 ++++-----
> fs/netfs/objects.c | 8 +++++---
> include/linux/netfs.h | 4 +++-
> 5 files changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
> index 501128188343..002c482794dc 100644
> --- a/fs/9p/vfs_addr.c
> +++ b/fs/9p/vfs_addr.c
> @@ -66,13 +66,12 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file)
> }
>
> /**
> - * v9fs_req_cleanup - Cleanup request initialized by v9fs_init_request
> - * @mapping: unused mapping of request to cleanup
> - * @priv: private data to cleanup, a fid, guaranted non-null.
> + * v9fs_free_request - Cleanup request initialized by v9fs_init_rreq
> + * @rreq: The I/O request to clean up
> */
> -static void v9fs_req_cleanup(struct address_space *mapping, void *priv)
> +static void v9fs_free_request(struct netfs_io_request *rreq)
> {
> - struct p9_fid *fid = priv;
> + struct p9_fid *fid = rreq->netfs_priv;
>
> p9_client_clunk(fid);
> }
> @@ -94,9 +93,9 @@ static int v9fs_begin_cache_operation(struct netfs_io_request *rreq)
>
> const struct netfs_request_ops v9fs_req_ops = {
> .init_request = v9fs_init_request,
> + .free_request = v9fs_free_request,
> .begin_cache_operation = v9fs_begin_cache_operation,
> .issue_read = v9fs_issue_read,
> - .cleanup = v9fs_req_cleanup,
> };
>
> /**
> diff --git a/fs/afs/file.c b/fs/afs/file.c
> index 26292a110a8f..b9ca72fbbcf9 100644
> --- a/fs/afs/file.c
> +++ b/fs/afs/file.c
> @@ -383,17 +383,17 @@ static int afs_check_write_begin(struct file *file, loff_t pos, unsigned len,
> return test_bit(AFS_VNODE_DELETED, &vnode->flags) ? -ESTALE : 0;
> }
>
> -static void afs_priv_cleanup(struct address_space *mapping, void *netfs_priv)
> +static void afs_free_request(struct netfs_io_request *rreq)
> {
> - key_put(netfs_priv);
> + key_put(rreq->netfs_priv);
> }
>
> const struct netfs_request_ops afs_req_ops = {
> .init_request = afs_init_request,
> + .free_request = afs_free_request,
> .begin_cache_operation = afs_begin_cache_operation,
> .check_write_begin = afs_check_write_begin,
> .issue_read = afs_issue_read,
> - .cleanup = afs_priv_cleanup,
> };
>
> int afs_write_inode(struct inode *inode, struct writeback_control *wbc)
> diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
> index b6edcf89a429..ee8c1b099c4f 100644
> --- a/fs/ceph/addr.c
> +++ b/fs/ceph/addr.c
> @@ -392,11 +392,10 @@ static int ceph_init_request(struct netfs_io_request *rreq, struct file *file)
> return 0;
> }
>
> -static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)
> +static void ceph_netfs_free_request(struct netfs_io_request *rreq)
> {
> - struct inode *inode = mapping->host;
> - struct ceph_inode_info *ci = ceph_inode(inode);
> - int got = (uintptr_t)priv;
> + struct ceph_inode_info *ci = ceph_inode(rreq->inode);
> + int got = (uintptr_t)rreq->netfs_priv;
>
> if (got)
> ceph_put_cap_refs(ci, got);
> @@ -404,12 +403,12 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv)
>
> const struct netfs_request_ops ceph_netfs_ops = {
> .init_request = ceph_init_request,
> + .free_request = ceph_netfs_free_request,
> .begin_cache_operation = ceph_begin_cache_operation,
> .issue_read = ceph_netfs_issue_read,
> .expand_readahead = ceph_netfs_expand_readahead,
> .clamp_length = ceph_netfs_clamp_length,
> .check_write_begin = ceph_netfs_check_write_begin,
> - .cleanup = ceph_readahead_cleanup,
> };
>
> #ifdef CONFIG_CEPH_FSCACHE
> diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c
> index e86107b30ba4..d6b8c0cbeb7c 100644
> --- a/fs/netfs/objects.c
> +++ b/fs/netfs/objects.c
> @@ -75,10 +75,10 @@ static void netfs_free_request(struct work_struct *work)
> struct netfs_io_request *rreq =
> container_of(work, struct netfs_io_request, work);
>
> - netfs_clear_subrequests(rreq, false);
> - if (rreq->netfs_priv)
> - rreq->netfs_ops->cleanup(rreq->mapping, rreq->netfs_priv);
> trace_netfs_rreq(rreq, netfs_rreq_trace_free);
> + netfs_clear_subrequests(rreq, false);
> + if (rreq->netfs_ops->free_request)
> + rreq->netfs_ops->free_request(rreq);
> if (rreq->cache_resources.ops)
> rreq->cache_resources.ops->end_operation(&rreq->cache_resources);
> kfree(rreq);
> @@ -140,6 +140,8 @@ static void netfs_free_subrequest(struct netfs_io_subrequest *subreq,
> struct netfs_io_request *rreq = subreq->rreq;
>
> trace_netfs_sreq(subreq, netfs_sreq_trace_free);
> + if (rreq->netfs_ops->free_subrequest)
> + rreq->netfs_ops->free_subrequest(subreq);
> kfree(subreq);
> netfs_stat_d(&netfs_n_rh_sreq);
> netfs_put_request(rreq, was_async, netfs_rreq_trace_put_subreq);
> diff --git a/include/linux/netfs.h b/include/linux/netfs.h
> index c7bf1eaf51d5..1970c21b4f80 100644
> --- a/include/linux/netfs.h
> +++ b/include/linux/netfs.h
> @@ -204,7 +204,10 @@ struct netfs_io_request {
> */
> struct netfs_request_ops {
> int (*init_request)(struct netfs_io_request *rreq, struct file *file);
> + void (*free_request)(struct netfs_io_request *rreq);
> + void (*free_subrequest)(struct netfs_io_subrequest *rreq);
Do we need free_subrequest? It looks like nothing defines it in this
series.
> int (*begin_cache_operation)(struct netfs_io_request *rreq);
> +
> void (*expand_readahead)(struct netfs_io_request *rreq);
> bool (*clamp_length)(struct netfs_io_subrequest *subreq);
> void (*issue_read)(struct netfs_io_subrequest *subreq);
> @@ -212,7 +215,6 @@ struct netfs_request_ops {
> int (*check_write_begin)(struct file *file, loff_t pos, unsigned len,
> struct folio *folio, void **_fsdata);
> void (*done)(struct netfs_io_request *rreq);
> - void (*cleanup)(struct address_space *mapping, void *netfs_priv);
> };
>
> /*
>
>
--
Jeff Layton <[email protected]>
Export netfs_put_subrequest() and a couple of tracepoints.
Signed-off-by: David Howells <[email protected]>
cc: Jeff Layton <[email protected]>
cc: [email protected]
---
fs/netfs/main.c | 3 +++
fs/netfs/objects.c | 1 +
2 files changed, 4 insertions(+)
diff --git a/fs/netfs/main.c b/fs/netfs/main.c
index 068568702957..3d0283f8d0b9 100644
--- a/fs/netfs/main.c
+++ b/fs/netfs/main.c
@@ -15,6 +15,9 @@ MODULE_DESCRIPTION("Network fs support");
MODULE_AUTHOR("Red Hat, Inc.");
MODULE_LICENSE("GPL");
+EXPORT_TRACEPOINT_SYMBOL(netfs_rreq);
+EXPORT_TRACEPOINT_SYMBOL(netfs_sreq);
+
unsigned netfs_debug;
module_param_named(debug, netfs_debug, uint, S_IWUSR | S_IRUGO);
MODULE_PARM_DESC(netfs_debug, "Netfs support debugging mask");
diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c
index d6b8c0cbeb7c..cbc40d052b46 100644
--- a/fs/netfs/objects.c
+++ b/fs/netfs/objects.c
@@ -160,3 +160,4 @@ void netfs_put_subrequest(struct netfs_io_subrequest *subreq, bool was_async,
if (dead)
netfs_free_subrequest(subreq, was_async);
}
+EXPORT_SYMBOL(netfs_put_subrequest);
Jeff Layton <[email protected]> wrote:
> Do we need free_subrequest? It looks like nothing defines it in this
> series.
These two patches add stuff that's used by stuff on my netfs-lib branch, but
that's not going to be pushed this window, so I won't push these two patches
for now.
David