nfsd: move struct nfsd_genl_rqstp to nfsctl.c

It's not used outside of that file.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 04e3954d54bd9f98da22635dec16fd7ea58bbea6..a457ed836972eb5d49257616a07367cd584c516a 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1412,6 +1412,21 @@ static int create_proc_exports_entry(void)
 
 unsigned int nfsd_net_id;
 
+struct nfsd_genl_rqstp {
+       struct sockaddr         rq_daddr;
+       struct sockaddr         rq_saddr;
+       unsigned long           rq_flags;
+       ktime_t                 rq_stime;
+       __be32                  rq_xid;
+       u32                     rq_vers;
+       u32                     rq_prog;
+       u32                     rq_proc;
+
+       /* NFSv4 compound */
+       u32                     rq_opcnt;
+       u32                     rq_opnum[16];
+};
+
 static int nfsd_genl_rpc_status_compose_msg(struct sk_buff *skb,
                                            struct netlink_callback *cb,
                                            struct nfsd_genl_rqstp *genl_rqstp)

diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 7c009f07c90b50d7074695d4665a2eca85140eda..260bf8badb032de18f973556fa5deabe7e67870d 100644 (file)
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -60,21 +60,6 @@ struct readdir_cd {
 /* Maximum number of operations per session compound */
 #define NFSD_MAX_OPS_PER_COMPOUND      200
 
-struct nfsd_genl_rqstp {
-       struct sockaddr         rq_daddr;
-       struct sockaddr         rq_saddr;
-       unsigned long           rq_flags;
-       ktime_t                 rq_stime;
-       __be32                  rq_xid;
-       u32                     rq_vers;
-       u32                     rq_prog;
-       u32                     rq_proc;
-
-       /* NFSv4 compound */
-       u32                     rq_opcnt;
-       u32                     rq_opnum[16];
-};
-
 extern struct svc_program      nfsd_programs[];
 extern const struct svc_version        nfsd_version2, nfsd_version3, nfsd_version4;
 extern struct mutex            nfsd_mutex;