diff options
| -rw-r--r-- | fs/lockd/host.c | 4 | ||||
| -rw-r--r-- | fs/lockd/lockd.h | 4 | ||||
| -rw-r--r-- | fs/lockd/mon.c | 2 | ||||
| -rw-r--r-- | fs/lockd/svc4proc.c | 4 | ||||
| -rw-r--r-- | fs/lockd/svcproc.c | 8 | ||||
| -rw-r--r-- | fs/lockd/xdr.c | 2 | ||||
| -rw-r--r-- | fs/lockd/xdr.h | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index ea8a8e166f7e..d572cb27533f 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -552,7 +552,7 @@ struct nlm_host * nlm_get_host(struct nlm_host *host) static struct nlm_host *next_host_state(struct hlist_head *cache, struct nsm_handle *nsm, - const struct nlm_reboot *info) + const struct lockd_reboot *info) { struct nlm_host *host; struct hlist_head *chain; @@ -582,7 +582,7 @@ static struct nlm_host *next_host_state(struct hlist_head *cache, * We were notified that the specified host has rebooted. Release * all resources held by that peer. */ -void nlm_host_rebooted(const struct net *net, const struct nlm_reboot *info) +void nlm_host_rebooted(const struct net *net, const struct lockd_reboot *info) { struct nsm_handle *nsm; struct nlm_host *host; diff --git a/fs/lockd/lockd.h b/fs/lockd/lockd.h index 4054e97723d8..ca389525a170 100644 --- a/fs/lockd/lockd.h +++ b/fs/lockd/lockd.h @@ -285,7 +285,7 @@ struct nlm_host * nlm_get_host(struct nlm_host *); void nlm_shutdown_hosts(void); void nlm_shutdown_hosts_net(struct net *net); void nlm_host_rebooted(const struct net *net, - const struct nlm_reboot *); + const struct lockd_reboot *); /* * Host monitoring @@ -299,7 +299,7 @@ struct nsm_handle *nsm_get_handle(const struct net *net, const char *hostname, const size_t hostname_len); struct nsm_handle *nsm_reboot_lookup(const struct net *net, - const struct nlm_reboot *info); + const struct lockd_reboot *info); void nsm_release(struct nsm_handle *nsm); /* diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 3d3ee88ca4dc..a8f5ac6f0577 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -377,7 +377,7 @@ retry: * error occurred. */ struct nsm_handle *nsm_reboot_lookup(const struct net *net, - const struct nlm_reboot *info) + const struct lockd_reboot *info) { struct nsm_handle *cached; struct lockd_net *ln = net_generic(net, lockd_net_id); diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index 1682a7c91a78..997f4f437997 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c @@ -61,7 +61,7 @@ static_assert(offsetof(struct nlm4_unlockargs_wrapper, xdrgen) == 0); struct nlm4_notifyargs_wrapper { struct nlm4_notifyargs xdrgen; - struct nlm_reboot reboot; + struct lockd_reboot reboot; }; static_assert(offsetof(struct nlm4_notifyargs_wrapper, xdrgen) == 0); @@ -918,7 +918,7 @@ static __be32 nlm4svc_proc_granted_res(struct svc_rqst *rqstp) static __be32 nlm4svc_proc_sm_notify(struct svc_rqst *rqstp) { struct nlm4_notifyargs_wrapper *argp = rqstp->rq_argp; - struct nlm_reboot *reboot = &argp->reboot; + struct lockd_reboot *reboot = &argp->reboot; if (!nlm_privileged_requester(rqstp)) { char buf[RPC_MAX_ADDRBUFLEN]; diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index e033320b840f..a79c9a46db60 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c @@ -518,7 +518,7 @@ nlmsvc_proc_free_all(struct svc_rqst *rqstp) static __be32 nlmsvc_proc_sm_notify(struct svc_rqst *rqstp) { - struct nlm_reboot *argp = rqstp->rq_argp; + struct lockd_reboot *argp = rqstp->rq_argp; dprintk("lockd: SM_NOTIFY called\n"); @@ -732,8 +732,8 @@ static const struct svc_procedure nlmsvc_procedures[24] = { .pc_func = nlmsvc_proc_sm_notify, .pc_decode = nlmsvc_decode_reboot, .pc_encode = nlmsvc_encode_void, - .pc_argsize = sizeof(struct nlm_reboot), - .pc_argzero = sizeof(struct nlm_reboot), + .pc_argsize = sizeof(struct lockd_reboot), + .pc_argzero = sizeof(struct lockd_reboot), .pc_ressize = sizeof(struct nlm_void), .pc_xdrressize = St, .pc_name = "SM_NOTIFY", @@ -816,7 +816,7 @@ static const struct svc_procedure nlmsvc_procedures[24] = { union nlmsvc_xdrstore { struct lockd_args args; struct lockd_res res; - struct nlm_reboot reboot; + struct lockd_reboot reboot; }; /* diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index bcf65152a436..c78c64557fea 100644 --- a/fs/lockd/xdr.c +++ b/fs/lockd/xdr.c @@ -244,7 +244,7 @@ nlmsvc_decode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr) bool nlmsvc_decode_reboot(struct svc_rqst *rqstp, struct xdr_stream *xdr) { - struct nlm_reboot *argp = rqstp->rq_argp; + struct lockd_reboot *argp = rqstp->rq_argp; __be32 *p; u32 len; diff --git a/fs/lockd/xdr.h b/fs/lockd/xdr.h index a480df7cae31..65d2d6d34310 100644 --- a/fs/lockd/xdr.h +++ b/fs/lockd/xdr.h @@ -80,7 +80,7 @@ struct lockd_res { /* * statd callback when client has rebooted */ -struct nlm_reboot { +struct lockd_reboot { char *mon; unsigned int len; u32 state; |