[SSI] openssi/kernel/cluster/ssi/cfs dir.c,1.26,1.27

Update of /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14613/cluster/ssi/cfs

Modified Files:
      Tag: OPENSSI-FC
	dir.c 
Log Message:
CFS:
- Fast path directory i_op->permission cfs_permission(); redundant since there is a recheck after token hold.

IPC:
- Fix [ ssic-linux-Bugs-2719607 ] memory leak in ipcname_gettotal() path; based on patch from John Hughes (hughesj).


Index: dir.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/dir.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- dir.c	24 Mar 2009 04:26:28 -0000	1.26
+++ dir.c	28 Mar 2009 23:44:15 -0000	1.27
@@ -95,10 +95,7 @@
 	.rmdir		= cfs_rmdir,
 	.mknod		= cfs_mknod,
 	.rename		= cfs_rename,
-#ifdef SSI_CFS_SKIP
-/* SSI: correct but redundant. See functions calling _cfs_permission() */
 	.permission	= cfs_permission,
-#endif
 	.getattr	= cfs_getattr,
 	.setattr	= cfs_setattr,
 };
@@ -1748,11 +1745,14 @@
 #endif
 			break;
 		case S_IFDIR:
+			/* SSI: will check permissions when we perform the op */
+#ifdef SSI_CFS_SKIP
 			/*
 			 * Optimize away all write operations, since the server
 			 * will check permissions when we perform the op.
 			 */
 			if ((mask & MAY_WRITE) && !(mask & MAY_READ))
+#endif
 				goto out;
  	}
 


------------------------------------------------------------------------------