[SSI] openssi/kernel/include/cluster/ssi/cfs cfs_fs.h, 1.25, 1.26 cfsfh.h, 1.10, 1.11 cfstok.h, 1.20, 1.21

Update of /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/cfs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14448/kernel/include/cluster/ssi/cfs

Modified Files:
      Tag: OPENSSI-FC
	cfs_fs.h cfsfh.h cfstok.h 
Log Message:
- remove up to two redundant cfstokargs structures from the stack. reduce stack usage in cfstok_msg() path.
- reduce unnecessary de-serialization / re-serialization of cfstokargs structure when client@server.

include/cluster/ssi/cfs/cfstok.h
- __init_cfstokargs: create based on cfs_tokmsg_seq().

cluster/ssi/cfs/cfstok.c
- cfstok_send: use __init_cfstokargs()

cluster/ssi/cfs/cfsproc.c
cluster/ssi/cfs/svrcfs.c
- cfstok_msg: revise function declaration. reduce number of arguments to one, pointer to cfstokargs structure.
- _cfs_tokmsg: removed. use cfs_tokmsg() instead.
- cfs_tokmsg_seq: removed. eliminate yet another cfstokargs structure from the stack.
- _cfs_tokmsg_seq: renamed to cfs_tokmsg_seq().
- svrcfstok_send: use __init_cfstokargs()
- cfstok_fail_noip: revise function declaration. reduce number of arguments to one, pointer to cfstokargs structure. eliminate yet another cfstokargs structure from the stack.

include/cluster/ssi/cfs/cfs_fs.h
include/cluster/ssi/cfs/cfsfh.h
- No need to include header file cluster/ssi/cfs/cfstok.h

 cluster/ssi/cfs/cfsproc.c        |    4 
 cluster/ssi/cfs/cfstok.c         |   71 +----
 cluster/ssi/cfs/svrcfs.c         |  415 +++++++++++++------------------
 include/cluster/ssi/cfs/cfs_fs.h |    1 
 include/cluster/ssi/cfs/cfsfh.h  |    1 
 include/cluster/ssi/cfs/cfstok.h |   20 -
 6 files changed, 207 insertions(+), 305 deletions(-)


Index: cfsfh.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/cfs/cfsfh.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cfsfh.h	27 Oct 2009 03:18:30 -0000	1.10
+++ cfsfh.h	15 Dec 2010 07:08:42 -0000	1.11
@@ -16,7 +16,6 @@
 # include <linux/types.h>
 # include <linux/string.h>
 # include <linux/fs.h>
-#include <cluster/ssi/cfs/cfstok.h>
 
 #ifdef SKIP
 /*

Index: cfs_fs.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/cfs/cfs_fs.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cfs_fs.h	15 Dec 2010 07:01:05 -0000	1.25
+++ cfs_fs.h	15 Dec 2010 07:08:42 -0000	1.26
@@ -14,7 +14,6 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 
-#include <cluster/ssi/cfs/cfstok.h>
 #include <cluster/ssi/cfs/cfs_fs_i.h>
 #include <cluster/ssi/cfs/cfs_fs_sb.h>
 #ifdef SKIP

Index: cfstok.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/cluster/ssi/cfs/cfstok.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cfstok.h	25 Oct 2010 04:43:26 -0000	1.20
+++ cfstok.h	15 Dec 2010 07:08:42 -0000	1.21
@@ -35,6 +35,9 @@
 #include <cluster/ssi/token/svrtok.h>
 #include <cluster/ssi/token/nscrtok.h>
 #include <cluster/nodelist.h>
+#ifdef CFS_EXPORT_OPS
+#include <cluster/ssi/cfs/cfsfh.h>
+#endif
 
 struct cfs_lockop {
 	struct inode *lo_ip;
@@ -543,18 +546,9 @@
 /*
  * Interfaces called from CFS server code (at the token server, really).
  */
-extern void cfs_tokmsg_seq(cfhandle_t *fhp, int type, int op, int oldmode,
-	int newmode, agent_t agent, range_off_t start, range_off_t len,
-	int flags, int mask, u_long delta, int seq,
-       	clusternode_t fromnode, struct cfs_fattr *attr);
-
-extern void cfs_tokmsg(cfhandle_t *fhp, int type, int op, int oldmode,
-	int newmode, agent_t agent, range_off_t start, range_off_t len,
-	int tokflags, int mask, u_long delta, int seq,
-	clusternode_t fromnode, struct cfs_fattr *attr);
+extern void cfs_tokmsg(struct cfstokargs *);
 
-extern void _cfs_tokmsg(struct cfstokargs *);
-extern void _cfs_tokmsg_seq(struct cfstokargs *);
+extern void cfs_tokmsg_seq(struct cfstokargs *);
 
 extern void svrcfstok_rel_hp_set(struct svrcfstok *hp, svrhold_list_t *hlistp,
 	agent_t agent);
@@ -617,9 +611,7 @@
 extern void _svrcfstok_convert(svrhold_list_t *hlistp, u_int *ntoksp,
 	struct cfs_nettok **tokspp);
 extern void svrcfstok_free(u_int ntoks, struct cfs_nettok *toksp);
-extern void cfstok_fail_noip(cfhandle_t *fhp, int op, int type, int oldmode,
-	int newmode, agent_t agent, range_off_t start, range_off_t len,
-	clusternode_t server);
+extern void cfstok_fail_noip(struct cfstokargs *);
 extern void svrcfstok_setvnflags(struct svrcfstok *hp, nsc_nodelist_t *nlp);
 extern void svrcfstok_getiflags(struct svrcfstok *hp, u_long *fp);
 extern void svrcfstok_remove_notify(struct svrcfstok *thp, struct svrcfstok *dhp,


------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d