File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -140,7 +140,7 @@ void nfs_local_disable(struct nfs_client *clp)
140140 spin_lock (& clp -> cl_localio_lock );
141141 if (test_and_clear_bit (NFS_CS_LOCAL_IO , & clp -> cl_flags )) {
142142 trace_nfs_local_disable (clp );
143- nfs_uuid_invalidate_one_client (& clp -> cl_uuid );
143+ nfs_localio_disable_client (& clp -> cl_uuid );
144144 }
145145 spin_unlock (& clp -> cl_localio_lock );
146146}
Original file line number Diff line number Diff line change @@ -107,7 +107,7 @@ static void nfs_uuid_put_locked(nfs_uuid_t *nfs_uuid)
107107 list_del_init (& nfs_uuid -> list );
108108}
109109
110- void nfs_uuid_invalidate_clients (struct list_head * list )
110+ void nfs_localio_invalidate_clients (struct list_head * list )
111111{
112112 nfs_uuid_t * nfs_uuid , * tmp ;
113113
@@ -116,17 +116,17 @@ void nfs_uuid_invalidate_clients(struct list_head *list)
116116 nfs_uuid_put_locked (nfs_uuid );
117117 spin_unlock (& nfs_uuid_lock );
118118}
119- EXPORT_SYMBOL_GPL (nfs_uuid_invalidate_clients );
119+ EXPORT_SYMBOL_GPL (nfs_localio_invalidate_clients );
120120
121- void nfs_uuid_invalidate_one_client (nfs_uuid_t * nfs_uuid )
121+ void nfs_localio_disable_client (nfs_uuid_t * nfs_uuid )
122122{
123123 if (nfs_uuid -> net ) {
124124 spin_lock (& nfs_uuid_lock );
125125 nfs_uuid_put_locked (nfs_uuid );
126126 spin_unlock (& nfs_uuid_lock );
127127 }
128128}
129- EXPORT_SYMBOL_GPL (nfs_uuid_invalidate_one_client );
129+ EXPORT_SYMBOL_GPL (nfs_localio_disable_client );
130130
131131struct nfsd_file * nfs_open_local_fh (nfs_uuid_t * uuid ,
132132 struct rpc_clnt * rpc_clnt , const struct cred * cred ,
Original file line number Diff line number Diff line change @@ -2276,14 +2276,14 @@ static __net_init int nfsd_net_init(struct net *net)
22762276 * nfsd_net_pre_exit - Disconnect localio clients from net namespace
22772277 * @net: a network namespace that is about to be destroyed
22782278 *
2279- * This invalidated ->net pointers held by localio clients
2279+ * This invalidates ->net pointers held by localio clients
22802280 * while they can still safely access nn->counter.
22812281 */
22822282static __net_exit void nfsd_net_pre_exit (struct net * net )
22832283{
22842284 struct nfsd_net * nn = net_generic (net , nfsd_net_id );
22852285
2286- nfs_uuid_invalidate_clients (& nn -> local_clients );
2286+ nfs_localio_invalidate_clients (& nn -> local_clients );
22872287}
22882288#endif
22892289
Original file line number Diff line number Diff line change @@ -37,8 +37,9 @@ bool nfs_uuid_begin(nfs_uuid_t *);
3737void nfs_uuid_end (nfs_uuid_t * );
3838void nfs_uuid_is_local (const uuid_t * , struct list_head * ,
3939 struct net * , struct auth_domain * , struct module * );
40- void nfs_uuid_invalidate_clients (struct list_head * list );
41- void nfs_uuid_invalidate_one_client (nfs_uuid_t * nfs_uuid );
40+
41+ void nfs_localio_disable_client (nfs_uuid_t * nfs_uuid );
42+ void nfs_localio_invalidate_clients (struct list_head * list );
4243
4344/* localio needs to map filehandle -> struct nfsd_file */
4445extern struct nfsd_file *
You can’t perform that action at this time.
0 commit comments