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

Commit f884dcae authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge branch 'sunrpc_cache-for-2.6.32' into nfs-for-2.6.32

parents 976a6f92 8854e82d

fs/nfs/idmap.c

+3 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void idmap_pipe_destroy_msg(struct rpc_pipe_msg *); 


static unsigned int fnvhash32(const void *, size_t);



static struct rpc_pipe_ops idmap_upcall_ops = {

static const struct rpc_pipe_ops idmap_upcall_ops = {

	.upcall		= idmap_pipe_upcall,

	.downcall	= idmap_pipe_downcall,

	.destroy_msg	= idmap_pipe_destroy_msg,
@@ -119,8 +119,8 @@ nfs_idmap_new(struct nfs_client *clp) 
	if (idmap == NULL)

		return -ENOMEM;



	idmap->idmap_dentry = rpc_mkpipe(clp->cl_rpcclient->cl_dentry, "idmap",

					 idmap, &idmap_upcall_ops, 0);

	idmap->idmap_dentry = rpc_mkpipe(clp->cl_rpcclient->cl_path.dentry,

			"idmap", idmap, &idmap_upcall_ops, 0);

	if (IS_ERR(idmap->idmap_dentry)) {

		error = PTR_ERR(idmap->idmap_dentry);

		kfree(idmap);

fs/nfsd/export.c

+12 −2
Original line number Diff line number Diff line
@@ -85,6 +85,11 @@ static void expkey_request(struct cache_detail *cd, 
	(*bpp)[-1] = '\n';

}



static int expkey_upcall(struct cache_detail *cd, struct cache_head *h)

{

	return sunrpc_cache_pipe_upcall(cd, h, expkey_request);

}



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;
@@ -259,7 +264,7 @@ static struct cache_detail svc_expkey_cache = { 
	.hash_table	= expkey_table,

	.name		= "nfsd.fh",

	.cache_put	= expkey_put,

	.cache_request	= expkey_request,

	.cache_upcall	= expkey_upcall,

	.cache_parse	= expkey_parse,

	.cache_show	= expkey_show,

	.match		= expkey_match,
@@ -355,6 +360,11 @@ static void svc_export_request(struct cache_detail *cd, 
	(*bpp)[-1] = '\n';

}



static int svc_export_upcall(struct cache_detail *cd, struct cache_head *h)

{

	return sunrpc_cache_pipe_upcall(cd, h, svc_export_request);

}



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 *);
@@ -724,7 +734,7 @@ struct cache_detail svc_export_cache = { 
	.hash_table	= export_table,

	.name		= "nfsd.export",

	.cache_put	= svc_export_put,

	.cache_request	= svc_export_request,

	.cache_upcall	= svc_export_upcall,

	.cache_parse	= svc_export_parse,

	.cache_show	= svc_export_show,

	.match		= svc_export_match,

fs/nfsd/nfs4idmap.c

+16 −4
Original line number Diff line number Diff line
@@ -145,6 +145,12 @@ idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp, 
	(*bpp)[-1] = '\n';

}



static int

idtoname_upcall(struct cache_detail *cd, struct cache_head *ch)

{

	return sunrpc_cache_pipe_upcall(cd, ch, idtoname_request);

}



static int

idtoname_match(struct cache_head *ca, struct cache_head *cb)

{
@@ -175,10 +181,10 @@ idtoname_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h) 
}



static void

warn_no_idmapd(struct cache_detail *detail)

warn_no_idmapd(struct cache_detail *detail, int has_died)

{

	printk("nfsd: nfsv4 idmapping failing: has idmapd %s?\n",

			detail->last_close? "died" : "not been started");

			has_died ? "died" : "not been started");

}
@@ -192,7 +198,7 @@ static struct cache_detail idtoname_cache = { 
	.hash_table	= idtoname_table,

	.name		= "nfs4.idtoname",

	.cache_put	= ent_put,

	.cache_request	= idtoname_request,

	.cache_upcall	= idtoname_upcall,

	.cache_parse	= idtoname_parse,

	.cache_show	= idtoname_show,

	.warn_no_listener = warn_no_idmapd,
@@ -324,6 +330,12 @@ nametoid_request(struct cache_detail *cd, struct cache_head *ch, char **bpp, 
	(*bpp)[-1] = '\n';

}



static int

nametoid_upcall(struct cache_detail *cd, struct cache_head *ch)

{

	return sunrpc_cache_pipe_upcall(cd, ch, nametoid_request);

}



static int

nametoid_match(struct cache_head *ca, struct cache_head *cb)

{
@@ -363,7 +375,7 @@ static struct cache_detail nametoid_cache = { 
	.hash_table	= nametoid_table,

	.name		= "nfs4.nametoid",

	.cache_put	= ent_put,

	.cache_request	= nametoid_request,

	.cache_upcall	= nametoid_upcall,

	.cache_parse	= nametoid_parse,

	.cache_show	= nametoid_show,

	.warn_no_listener = warn_no_idmapd,

include/linux/sunrpc/cache.h

+34 −6
Original line number Diff line number Diff line
@@ -59,6 +59,15 @@ struct cache_head { 


#define	CACHE_NEW_EXPIRY 120	/* keep new things pending confirmation for 120 seconds */



struct cache_detail_procfs {

	struct proc_dir_entry	*proc_ent;

	struct proc_dir_entry   *flush_ent, *channel_ent, *content_ent;

};



struct cache_detail_pipefs {

	struct dentry *dir;

};



struct cache_detail {

	struct module *		owner;

	int			hash_size;
@@ -70,15 +79,17 @@ struct cache_detail { 
	char			*name;

	void			(*cache_put)(struct kref *);



	void			(*cache_request)(struct cache_detail *cd,

						 struct cache_head *h,

						 char **bpp, int *blen);

	int			(*cache_upcall)(struct cache_detail *,

						struct cache_head *);



	int			(*cache_parse)(struct cache_detail *,

					       char *buf, int len);



	int			(*cache_show)(struct seq_file *m,

					      struct cache_detail *cd,

					      struct cache_head *h);

	void			(*warn_no_listener)(struct cache_detail *cd,

					      int has_died);



	struct cache_head *	(*alloc)(void);

	int			(*match)(struct cache_head *orig, struct cache_head *new);
@@ -96,13 +107,15 @@ struct cache_detail { 


	/* fields for communication over channel */

	struct list_head	queue;

	struct proc_dir_entry	*proc_ent;

	struct proc_dir_entry   *flush_ent, *channel_ent, *content_ent;



	atomic_t		readers;		/* how many time is /chennel open */

	time_t			last_close;		/* if no readers, when did last close */

	time_t			last_warn;		/* when we last warned about no readers */

	void			(*warn_no_listener)(struct cache_detail *cd);



	union {

		struct cache_detail_procfs procfs;

		struct cache_detail_pipefs pipefs;

	} u;

};
@@ -127,6 +140,10 @@ struct cache_deferred_req { 
};





extern const struct file_operations cache_file_operations_pipefs;

extern const struct file_operations content_file_operations_pipefs;

extern const struct file_operations cache_flush_operations_pipefs;



extern struct cache_head *

sunrpc_cache_lookup(struct cache_detail *detail,

		    struct cache_head *key, int hash);
@@ -134,6 +151,13 @@ extern struct cache_head * 
sunrpc_cache_update(struct cache_detail *detail,

		    struct cache_head *new, struct cache_head *old, int hash);



extern int

sunrpc_cache_pipe_upcall(struct cache_detail *detail, struct cache_head *h,

		void (*cache_request)(struct cache_detail *,

				      struct cache_head *,

				      char **,

				      int *));





extern void cache_clean_deferred(void *owner);
@@ -171,6 +195,10 @@ extern void cache_purge(struct cache_detail *detail); 
extern int cache_register(struct cache_detail *cd);

extern void cache_unregister(struct cache_detail *cd);



extern int sunrpc_cache_register_pipefs(struct dentry *parent, const char *,

					mode_t, struct cache_detail *);

extern void sunrpc_cache_unregister_pipefs(struct cache_detail *);



extern void qword_add(char **bpp, int *lp, char *str);

extern void qword_addhex(char **bpp, int *lp, char *buf, int blen);

extern int qword_get(char **bpp, char *dest, int bufsize);

include/linux/sunrpc/clnt.h

+2 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/sunrpc/xdr.h>

#include <linux/sunrpc/timer.h>

#include <asm/signal.h>

#include <linux/path.h>



struct rpc_inode;
@@ -54,9 +55,7 @@ struct rpc_clnt { 


	int			cl_nodelen;	/* nodename length */

	char 			cl_nodename[UNX_MAXNODENAME];

	char			cl_pathname[30];/* Path in rpc_pipe_fs */

	struct vfsmount *	cl_vfsmnt;

	struct dentry *		cl_dentry;	/* inode */

	struct path		cl_path;

	struct rpc_clnt *	cl_parent;	/* Points to parent of clones */

	struct rpc_rtt		cl_rtt_default;

	struct rpc_timeout	cl_timeout_default;