[Pvfs2-cvs] commit by pcarns in pvfs2/src/server: pvfs2-server.c

CVS commit program cvs at parl.clemson.edu
Wed Aug 6 15:39:31 EDT 2008


Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb1:/tmp/cvs-serv23064/src/server

Modified Files:
	pvfs2-server.c 
Log Message:
minor tweak to how shm key is generated; incorporate fsid of first file
system in configuration (allows two unrelated servers to both use shm
in bdb on same box as long as they have different fsids)


Index: pvfs2-server.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/pvfs2-server.c,v
diff -p -u -r1.254 -r1.255
--- pvfs2-server.c	23 May 2008 20:45:13 -0000	1.254
+++ pvfs2-server.c	6 Aug 2008 19:39:31 -0000	1.255
@@ -1851,6 +1851,7 @@ static int generate_shm_key_hint(void)
 {
     int server_index = 1;
     struct host_alias_s *cur_alias = NULL;
+    struct filesystem_configuration_s *first_fs;
 
     PINT_llist *cur = server_config.host_aliases;
 
@@ -1868,7 +1869,8 @@ static int generate_shm_key_hint(void)
             /* space the shm keys out by 10 to allow for Berkeley DB using 
              * using more than one key on each server
              */
-            return(server_index*10);        
+            first_fs = PINT_llist_head(server_config.file_systems);
+            return(first_fs->coll_id + server_index*10);
         }
 
         server_index++;



More information about the Pvfs2-cvs mailing list