[SSI] openssi/kernel/cluster/ssi/cfs file.c,1.27,1.28

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

Modified Files:
      Tag: OPENSSI-FC
	file.c 
Log Message:
cluster/ssi/cfs/file.c (#ifdef CFSTOK_INTR)
- cfs_file_llseek: return -ERESTARTSYS instead of -EINTR
- cfs_shared_nopage: return -ERESTARTSYS instead of -EINTR
- cfs_file_flush: return -ERESTARTSYS instead of -EINTR
- __cfs_file_read: return -ERESTARTSYS instead of -EINTR
- cfs_private_nopage: return -ERESTARTSYS instead of -EINTR
- cfs_fsync: return -ERESTARTSYS instead of -EINTR
- __cfs_file_write: return -ERESTARTSYS instead of -EINTR


Index: file.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/cluster/ssi/cfs/file.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- file.c	15 Dec 2010 06:44:25 -0000	1.27
+++ file.c	15 Dec 2010 07:33:16 -0000	1.28
@@ -157,7 +157,7 @@
 #ifdef DEBUG
 			printk(KERN_DEBUG "%s: Interrupted\n", __FUNCTION__);
 #endif
-			return -EINTR;
+			return -ERESTARTSYS;
 		}
 #else
 		(void)cfstok_req(inode, CFSTOK_ATTR, CFSTOK_READ,
@@ -208,7 +208,7 @@
 #ifdef DEBUG
 		printk(KERN_DEBUG "%s: Interrupted\n", __FUNCTION__);
 #endif
-		return -EINTR;
+		return -ERESTARTSYS;
 	}
 #endif
 	SSI_ASSERT(status == CFSTOK_HELD);
@@ -285,7 +285,7 @@
 #ifdef DEBUG
 		printk(KERN_DEBUG "%s: Interrupted\n", __FUNCTION__);
 #endif
-		return -EINTR;
+		return -ERESTARTSYS;
 	}
 #endif
 	SSI_ASSERT(result == CFSTOK_HELD);
@@ -374,7 +374,7 @@
 #ifdef DEBUG
 		printk(KERN_DEBUG "%s: Interrupted\n", __FUNCTION__);
 #endif
-		return ERR_PTR(-EINTR);
+		return ERR_PTR(-ERESTARTSYS);
 	}
 #else
 	(void)cfstok_req(inode, CFSTOK_ATTR, CFSTOK_EXCL,
@@ -427,7 +427,7 @@
 #ifdef DEBUG
 		printk(KERN_DEBUG "%s: Interrupted\n", __FUNCTION__);
 #endif
-		return ERR_PTR(-EINTR);
+		return ERR_PTR(-ERESTARTSYS);
 	}
 #else
 	(void)cfstok_req(inode, CFSTOK_ATTR, CFSTOK_READ,
@@ -516,7 +516,7 @@
 #ifdef DEBUG
 		printk(KERN_DEBUG "%s: Interrupted\n", __FUNCTION__);
 #endif
-		return -EINTR;
+		return -ERESTARTSYS;
 	}
 #endif
 	SSI_ASSERT(status == CFSTOK_HELD);
@@ -639,7 +639,7 @@
 #ifdef DEBUG
 		printk(KERN_DEBUG "%s: Interrupted\n", __FUNCTION__);
 #endif
-		return -EINTR;
+		return -ERESTARTSYS;
 	}
 #endif
 	SSI_ASSERT(result == CFSTOK_HELD);


------------------------------------------------------------------------------
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