nfs: fix RCU cl_xprt handling in nfs_swap_activate/deactivate
Subsystems (2)
PATCH 1/1 nfs: fix RCU cl_xprt handling in nfs_swap_activate/deactivate
sparse says:
fs/nfs/file.c:543:60: warning: incorrect type in argument 1 (different address spaces)fs/nfs/file.c:543:60: expected struct rpc_xprt *xprtfs/nfs/file.c:543:60: got struct rpc_xprt [noderef] <asn:4>*cl_xprtfs/nfs/file.c:548:53: warning: incorrect type in argument 1 (different address spaces)fs/nfs/file.c:548:53: expected struct rpc_xprt *xprtfs/nfs/file.c:548:53: got struct rpc_xprt [noderef] <asn:4>*cl_xprt
cl_xprt is RCU-managed, so we need to take care to dereference and use it while holding the RCU read lock.
Cc Mel Gorman <[email protected]>
Signed-off-by Jeff Layton <[email protected]>
--- fs/nfs/file.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
fs/nfs/file.c +14 -2
@@ -539,13 +539,25 @@ static int nfs_launder_page(struct page *page)static int nfs_swap_activate (struct swap_info_struct *sis,struct file *file,sector_t *span) { +int ret; +struct rpc_clnt *clnt =NFS_CLIENT (file->f_mapping->host); + *span = sis->pages; -return xs_swapper (NFS_CLIENT (file->f_mapping->host)->cl_xprt,1 ); + +rcu_read_lock (); + ret =xs_swapper (rcu_dereference (clnt->cl_xprt),1 ); +rcu_read_unlock (); + +return ret; }static void nfs_swap_deactivate (struct file *file) { -xs_swapper (NFS_CLIENT (file->f_mapping->host)->cl_xprt,0 ); +struct rpc_clnt *clnt =NFS_CLIENT (file->f_mapping->host); + +rcu_read_lock (); +xs_swapper (rcu_dereference (clnt->cl_xprt),0 ); +rcu_read_unlock (); }#endif
Signature · 1 line
1.9.3