hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SUNRPC: Fix a few sparse warnings 

net/sunrpc/svcsock.c:412:22: warning: incorrect type in assignment
(different address spaces)
 - svc_partial_recvfrom now takes a struct kvec, so the variable
   save_iovbase needs to be an ordinary (void *)

Make a bunch of variables in net/sunrpc/xprtsock.c static

Fix a couple of "warning: symbol 'foo' was not declared. Should it be
static?" reports.

Fix a couple of conflicting function declarations.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-03-11 15:22:54 -04:00
parent 17280175c5
commit 09acfea5d8
10 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/sunrpc/bc_xprt.h
View File

@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
struct rpc_rqst *xprt_alloc_bc_request(struct rpc_xprt *xprt); struct rpc_rqst *xprt_alloc_bc_request(struct rpc_xprt *xprt);
void xprt_free_bc_request(struct rpc_rqst *req); void xprt_free_bc_request(struct rpc_rqst *req);
int xprt_setup_backchannel(struct rpc_xprt *, unsigned int min_reqs); int xprt_setup_backchannel(struct rpc_xprt *, unsigned int min_reqs);
void xprt_destroy_backchannel(struct rpc_xprt *, int max_reqs); void xprt_destroy_backchannel(struct rpc_xprt *, unsigned int max_reqs);
int bc_send(struct rpc_rqst *req); int bc_send(struct rpc_rqst *req);
/* /*

3
include/linux/sunrpc/svcauth.h
View File

@ -135,6 +135,9 @@ extern void svcauth_unix_purge(void);
extern void svcauth_unix_info_release(struct svc_xprt *xpt); extern void svcauth_unix_info_release(struct svc_xprt *xpt);
extern int svcauth_unix_set_client(struct svc_rqst *rqstp); extern int svcauth_unix_set_client(struct svc_rqst *rqstp);
extern int unix_gid_cache_create(struct net *net);
extern void unix_gid_cache_destroy(struct net *net);
static inline unsigned long hash_str(char *name, int bits) static inline unsigned long hash_str(char *name, int bits)
{ {
unsigned long hash = 0; unsigned long hash = 0;

12
include/linux/sunrpc/xprtsock.h
View File

@ -12,18 +12,6 @@
int init_socket_xprt(void); int init_socket_xprt(void);
void cleanup_socket_xprt(void); void cleanup_socket_xprt(void);
/*
* RPC slot table sizes for UDP, TCP transports
*/
extern unsigned int xprt_udp_slot_table_entries;
extern unsigned int xprt_tcp_slot_table_entries;
/*
* Parameters for choosing a free port
*/
extern unsigned int xprt_min_resvport;
extern unsigned int xprt_max_resvport;
#define RPC_MIN_RESVPORT (1U) #define RPC_MIN_RESVPORT (1U)
#define RPC_MAX_RESVPORT (65535U) #define RPC_MAX_RESVPORT (65535U)
#define RPC_DEF_MIN_RESVPORT (665U) #define RPC_DEF_MIN_RESVPORT (665U)

2
net/sunrpc/auth_gss/gss_krb5_mech.c
View File

@ -344,7 +344,7 @@ out_err:
return PTR_ERR(p); return PTR_ERR(p);
} }
struct crypto_blkcipher * static struct crypto_blkcipher *
context_v2_alloc_cipher(struct krb5_ctx *ctx, const char *cname, u8 *key) context_v2_alloc_cipher(struct krb5_ctx *ctx, const char *cname, u8 *key)
{ {
struct crypto_blkcipher *cp; struct crypto_blkcipher *cp;

2
net/sunrpc/auth_gss/gss_krb5_seal.c
View File

@ -159,7 +159,7 @@ gss_get_mic_v1(struct krb5_ctx *ctx, struct xdr_buf *text,
return (ctx->endtime < now) ? GSS_S_CONTEXT_EXPIRED : GSS_S_COMPLETE; return (ctx->endtime < now) ? GSS_S_CONTEXT_EXPIRED : GSS_S_COMPLETE;
} }
u32 static u32
gss_get_mic_v2(struct krb5_ctx *ctx, struct xdr_buf *text, gss_get_mic_v2(struct krb5_ctx *ctx, struct xdr_buf *text,
struct xdr_netobj *token) struct xdr_netobj *token)
{ {

1
net/sunrpc/backchannel_rqst.c
View File

@ -25,6 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sunrpc/xprt.h> #include <linux/sunrpc/xprt.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/sunrpc/bc_xprt.h>
#ifdef RPC_DEBUG #ifdef RPC_DEBUG
#define RPCDBG_FACILITY RPCDBG_TRANS #define RPCDBG_FACILITY RPCDBG_TRANS

2
net/sunrpc/rpc_pipe.c
View File

@ -1149,7 +1149,7 @@ rpc_mount(struct file_system_type *fs_type,
return mount_ns(fs_type, flags, current->nsproxy->net_ns, rpc_fill_super); return mount_ns(fs_type, flags, current->nsproxy->net_ns, rpc_fill_super);
} }
void rpc_kill_sb(struct super_block *sb) static void rpc_kill_sb(struct super_block *sb)
{ {
struct net *net = sb->s_fs_info; struct net *net = sb->s_fs_info;
struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);

3
net/sunrpc/sunrpc_syms.c
View File

@ -27,9 +27,6 @@
int sunrpc_net_id; int sunrpc_net_id;
EXPORT_SYMBOL_GPL(sunrpc_net_id); EXPORT_SYMBOL_GPL(sunrpc_net_id);
extern int unix_gid_cache_create(struct net *net);
extern int unix_gid_cache_destroy(struct net *net);
static __net_init int sunrpc_init_net(struct net *net) static __net_init int sunrpc_init_net(struct net *net)
{ {
int err; int err;

2
net/sunrpc/svcsock.c
View File

@ -396,7 +396,7 @@ static int svc_partial_recvfrom(struct svc_rqst *rqstp,
int buflen, unsigned int base) int buflen, unsigned int base)
{ {
size_t save_iovlen; size_t save_iovlen;
void __user *save_iovbase; void *save_iovbase;
unsigned int i; unsigned int i;
int ret; int ret;

10
net/sunrpc/xprtsock.c
View File

@ -53,12 +53,12 @@ static void xs_close(struct rpc_xprt *xprt);
/* /*
* xprtsock tunables * xprtsock tunables
*/ */
unsigned int xprt_udp_slot_table_entries = RPC_DEF_SLOT_TABLE; static unsigned int xprt_udp_slot_table_entries = RPC_DEF_SLOT_TABLE;
unsigned int xprt_tcp_slot_table_entries = RPC_MIN_SLOT_TABLE; static unsigned int xprt_tcp_slot_table_entries = RPC_MIN_SLOT_TABLE;
unsigned int xprt_max_tcp_slot_table_entries = RPC_MAX_SLOT_TABLE; static unsigned int xprt_max_tcp_slot_table_entries = RPC_MAX_SLOT_TABLE;
unsigned int xprt_min_resvport = RPC_DEF_MIN_RESVPORT; static unsigned int xprt_min_resvport = RPC_DEF_MIN_RESVPORT;
unsigned int xprt_max_resvport = RPC_DEF_MAX_RESVPORT; static unsigned int xprt_max_resvport = RPC_DEF_MAX_RESVPORT;
#define XS_TCP_LINGER_TO (15U * HZ) #define XS_TCP_LINGER_TO (15U * HZ)
static unsigned int xs_tcp_fin_timeout __read_mostly = XS_TCP_LINGER_TO; static unsigned int xs_tcp_fin_timeout __read_mostly = XS_TCP_LINGER_TO;