Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39d7bbcb authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: remove extraneous header inclusions 



include/linux/sunrpc/clnt.h already includes include/linux/sunrpc/xprt.h.
We can remove xprt.h from source files that already include clnt.h.
Likewise include/linux/sunrpc/timer.h.

Test plan:
Compile kernel with CONFIG_NFS enabled.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 081f79a9

fs/nfs/mount_clnt.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/net.h>

#include <linux/in.h>

#include <linux/sunrpc/clnt.h>

#include <linux/sunrpc/xprt.h>

#include <linux/sunrpc/sched.h>

#include <linux/nfs_fs.h>

include/linux/nfs_xdr.h

+0 −1
Original line number Diff line number Diff line 
#ifndef _LINUX_NFS_XDR_H

#define _LINUX_NFS_XDR_H



#include <linux/sunrpc/xprt.h>

#include <linux/nfsacl.h>



/*

net/sunrpc/pmap_clnt.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/uio.h>

#include <linux/in.h>

#include <linux/sunrpc/clnt.h>

#include <linux/sunrpc/xprt.h>

#include <linux/sunrpc/sched.h>



#ifdef RPC_DEBUG

net/sunrpc/sched.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/mutex.h>



#include <linux/sunrpc/clnt.h>

#include <linux/sunrpc/xprt.h>



#ifdef RPC_DEBUG

#define RPCDBG_FACILITY		RPCDBG_SCHED

net/sunrpc/timer.c

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#include <linux/unistd.h>



#include <linux/sunrpc/clnt.h>

#include <linux/sunrpc/xprt.h>

#include <linux/sunrpc/timer.h>



#define RPC_RTO_MAX (60*HZ)

#define RPC_RTO_INIT (HZ/5)