[SSI] openssi/kernel/include/asm-i386 semaphore.h,1.8,1.9

Update of /cvsroot/ssic-linux/openssi/kernel/include/asm-i386
In directory vz-cvs-3.sog:/tmp/cvs-serv3648/include/asm-i386

Modified Files:
      Tag: OPENSSI-FC
	semaphore.h 
Log Message:
(#ifdef CFS_FILE_WRITE_LIVELOCK_FIX)
- remove "flusher" anonymous pointer from semaphore structure. no longer used.
- remove unset_sem_flushing(), set_sem_flushing(), sem_flushing(). no longer used.


Index: semaphore.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/include/asm-i386/semaphore.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- semaphore.h	25 Oct 2010 05:56:23 -0000	1.8
+++ semaphore.h	16 Nov 2011 07:53:41 -0000	1.9
@@ -49,29 +49,12 @@
 	int sleepers;
 #ifdef CONFIG_SSI
 	void *owner;
-#ifdef CFS_FILE_WRITE_LIVELOCK_FIX
-/* Support recursive non-interruptible acquired sempahore. This is needed
- * for OpenSSI CFS client@server because in those code paths
- * the VM revisits -eg. generic_file_writev() on memory pressure.	-Roger
- */
-	void *flusher;
-#endif
 #endif
 	wait_queue_head_t wait;
 };
 
 
 #ifdef CONFIG_SSI
-#ifdef CFS_FILE_WRITE_LIVELOCK_FIX
-#define __SEMAPHORE_INITIALIZER(name, n)				\
-{									\
-	.count		= ATOMIC_INIT(n),				\
-	.sleepers	= 0,						\
-	.owner		= NULL,						\
-	.flusher	= NULL,						\
-	.wait		= __WAIT_QUEUE_HEAD_INITIALIZER((name).wait)	\
-}
-#else
 #define __SEMAPHORE_INITIALIZER(name, n)				\
 {									\
 	.count		= ATOMIC_INIT(n),				\
@@ -79,7 +62,6 @@
 	.owner		= NULL,						\
 	.wait		= __WAIT_QUEUE_HEAD_INITIALIZER((name).wait)	\
 }
-#endif /* !CFS_FILE_WRITE_LIVELOCK_FIX */
 #else
 #define __SEMAPHORE_INITIALIZER(name, n)				\
 {									\
@@ -110,9 +92,6 @@
 	sem->sleepers = 0;
 #ifdef CONFIG_SSI
 	sem->owner = NULL;
-#ifdef CFS_FILE_WRITE_LIVELOCK_FIX
-	sem->flusher = NULL;
-#endif
 #endif
 	init_waitqueue_head(&sem->wait);
 }
@@ -142,22 +121,6 @@
 {
 	return (sem->owner == current);
 }
-#ifdef CFS_FILE_WRITE_LIVELOCK_FIX
-static inline int sem_flushing(struct semaphore *sem)
-{
-	return (sem->flusher == current);
-}
-
-static inline void set_sem_flushing(struct semaphore *sem)
-{
-	sem->flusher = current;
-}
-
-static inline void unset_sem_flushing(struct semaphore *sem)
-{
-	sem->flusher = NULL;
-}
-#endif
 #endif
 
 /*
@@ -167,12 +130,6 @@
  */
 static inline void down(struct semaphore * sem)
 {
-#ifdef CONFIG_SSI
-#ifdef CFS_FILE_WRITE_LIVELOCK_FIX
-	if (sem_flushing(sem))
-		return;
-#endif
-#endif
 	might_sleep();
 	__asm__ __volatile__(
 		"# atomic down operation\n\t"
@@ -261,10 +218,6 @@
 static inline void up(struct semaphore * sem)
 {
 #ifdef CONFIG_SSI
-#ifdef CFS_FILE_WRITE_LIVELOCK_FIX
-	if (sem_flushing(sem))
-		return;
-#endif
 	sem->owner = NULL;
 #endif
 	__asm__ __volatile__(


------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1