Commit 74cae61a authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] fs/nfsd/export.c,net/sunrpc/cache.c: make needlessly global code static 



We can now make some code static.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Neil Brown <neilb@suse.de>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent baab935f

fs/nfsd/export.c

+8 −5
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int exp_verify_string(char *cp, int max); 
#define	EXPKEY_HASHMASK		(EXPKEY_HASHMAX -1)

static struct cache_head *expkey_table[EXPKEY_HASHMAX];



void expkey_put(struct kref *ref)

static void expkey_put(struct kref *ref)

{

	struct svc_expkey *key = container_of(ref, struct svc_expkey, h.ref);
@@ -87,6 +87,8 @@ static void expkey_request(struct cache_detail *cd, 


static struct svc_expkey *svc_expkey_update(struct svc_expkey *new, struct svc_expkey *old);

static struct svc_expkey *svc_expkey_lookup(struct svc_expkey *);

static struct cache_detail svc_expkey_cache;



static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)

{

	/* client fsidtype fsid [path] */
@@ -255,7 +257,7 @@ static struct cache_head *expkey_alloc(void) 
		return NULL;

}



struct cache_detail svc_expkey_cache = {

static struct cache_detail svc_expkey_cache = {

	.owner		= THIS_MODULE,

	.hash_size	= EXPKEY_HASHMAX,

	.hash_table	= expkey_table,
@@ -345,7 +347,8 @@ static void svc_export_request(struct cache_detail *cd, 
	(*bpp)[-1] = '\n';

}



struct svc_export *svc_export_update(struct svc_export *new, struct svc_export *old);

static struct svc_export *svc_export_update(struct svc_export *new,

					    struct svc_export *old);

static struct svc_export *svc_export_lookup(struct svc_export *);



static int check_export(struct inode *inode, int flags)
@@ -574,7 +577,7 @@ svc_export_lookup(struct svc_export *exp) 
		return NULL;

}



struct svc_export *

static struct svc_export *

svc_export_update(struct svc_export *new, struct svc_export *old)

{

	struct cache_head *ch;
@@ -593,7 +596,7 @@ svc_export_update(struct svc_export *new, struct svc_export *old) 
}





struct svc_expkey *

static struct svc_expkey *

exp_find_key(svc_client *clp, int fsid_type, u32 *fsidv, struct cache_req *reqp)

{

	struct svc_expkey key, *ek;

include/linux/nfsd/export.h

+1 −4
Original line number Diff line number Diff line
@@ -86,9 +86,6 @@ void nfsd_export_shutdown(void); 
void			nfsd_export_flush(void);

void			exp_readlock(void);

void			exp_readunlock(void);

struct svc_expkey *	exp_find_key(struct auth_domain *clp, 

				     int fsid_type, u32 *fsidv,

				     struct cache_req *reqp);

struct svc_export *	exp_get_by_name(struct auth_domain *clp,

					struct vfsmount *mnt,

					struct dentry *dentry,
@@ -102,7 +99,7 @@ int exp_rootfh(struct auth_domain *, 
int			exp_pseudoroot(struct auth_domain *, struct svc_fh *fhp, struct cache_req *creq);

int			nfserrno(int errno);



extern struct cache_detail svc_export_cache, svc_expkey_cache;

extern struct cache_detail svc_export_cache;



static inline void exp_put(struct svc_export *exp)

{

include/linux/sunrpc/cache.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ static inline void cache_put(struct cache_head *h, struct cache_detail *cd) 
	kref_put(&h->ref, cd->cache_put);

}



extern void cache_init(struct cache_head *h);

extern int cache_check(struct cache_detail *detail,

		       struct cache_head *h, struct cache_req *rqstp);

extern void cache_flush(void);

net/sunrpc/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
static void cache_defer_req(struct cache_req *req, struct cache_head *item);

static void cache_revisit_request(struct cache_head *item);



void cache_init(struct cache_head *h)

static void cache_init(struct cache_head *h)

{

	time_t now = get_seconds();

	h->next = NULL;

net/sunrpc/sunrpc_syms.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ EXPORT_SYMBOL(auth_unix_lookup); 
EXPORT_SYMBOL(cache_check);

EXPORT_SYMBOL(cache_flush);

EXPORT_SYMBOL(cache_purge);

EXPORT_SYMBOL(cache_init);

EXPORT_SYMBOL(cache_register);

EXPORT_SYMBOL(cache_unregister);

EXPORT_SYMBOL(qword_add);

CRA Git | Maintained and supported by SUSTech CRA and CCSE