[Pvfs2-cvs] commit by slang in pvfs2/src/kernel/linux-2.6: file.c

CVS commit program cvs at parl.clemson.edu
Fri Dec 1 12:15:51 EST 2006


Update of /projects/cvsroot/pvfs2/src/kernel/linux-2.6
In directory parlweb1:/tmp/cvs-serv21754/src/kernel/linux-2.6

Modified Files:
	file.c 
Log Message:
Murali's ssize_t fixes


Index: file.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/kernel/linux-2.6/file.c,v
diff -p -u -r1.131 -r1.132
--- file.c	1 Dec 2006 17:05:29 -0000	1.131
+++ file.c	1 Dec 2006 17:15:50 -0000	1.132
@@ -429,11 +429,11 @@ repeat:
     return 0;
 }
 
-static long estimate_max_iovecs(const struct iovec *curr, unsigned long nr_segs, ssize_t *total_count)
+static long estimate_max_iovecs(const struct iovec *curr, unsigned long nr_segs, size_t *total_count)
 {
     unsigned long i;
     long max_nr_iovecs;
-    ssize_t total, count;
+    size_t total, count;
 
     total = 0;
     count = 0;
@@ -988,11 +988,11 @@ repeat:
 }
 
 static long 
-estimate_max_xtvecs(const struct xtvec *curr, unsigned long nr_segs, ssize_t *total_count)
+estimate_max_xtvecs(const struct xtvec *curr, unsigned long nr_segs, size_t *total_count)
 {
     unsigned long i;
     long max_nr_xtvecs;
-    ssize_t total, count;
+    size_t total, count;
 
     total = 0;
     count = 0;
@@ -1202,7 +1202,8 @@ out:
 
 static ssize_t do_direct_readx_writex(struct rw_options *rw)
 {
-    ssize_t ret, total_count, count_mem, count_stream;
+    ssize_t ret, total_count;
+    size_t count_mem, count_stream;
     struct inode *inode = NULL;
     pvfs2_inode_t *pvfs2_inode = NULL;
     unsigned int to_free;



More information about the Pvfs2-cvs mailing list