patch-2.4.26 linux-2.4.26/fs/xfs/linux/xfs_file.c

• Lines: 67
• Date: 2004-04-14 06:05:40.000000000 -0700
• Orig file: linux-2.4.25/fs/xfs/linux/xfs_file.c
• Orig date: 2004-02-18 05:36:31.000000000 -0800

diff -urN linux-2.4.25/fs/xfs/linux/xfs_file.c linux-2.4.26/fs/xfs/linux/xfs_file.c
@@ -68,17 +68,18 @@
 {
 	struct inode	*inode = file->f_dentry->d_inode;
 	vnode_t		*vp = LINVFS_GET_VP(inode);
-	int		error;
+	size_t		rval;
 
 	if (unlikely(file->f_flags & O_DIRECT)) {
 		ioflags |= IO_ISDIRECT;
 		down_read(&inode->i_alloc_sem);
-		VOP_READ(vp, file, buf, size, offset, ioflags, NULL, error);
+		VOP_READ(vp, file, buf, size, offset, ioflags, NULL, rval);
 		up_read(&inode->i_alloc_sem);
 	} else {
-		VOP_READ(vp, file, buf, size, offset, ioflags, NULL, error);
+		VOP_READ(vp, file, buf, size, offset, ioflags, NULL, rval);
 	}
-	return error;
+
+	return rval;
 }
 
 STATIC ssize_t
@@ -113,7 +114,7 @@
 	struct inode	*inode = file->f_dentry->d_inode;
 	vnode_t		*vp = LINVFS_GET_VP(inode);
 	loff_t		pos;
-	int		error;	/* Use negative errors in this f'n */
+	ssize_t		rval;	/* Use negative errors in this f'n */
 
 	if ((ssize_t) count < 0)
 		return -EINVAL;
@@ -125,10 +126,10 @@
 	if (pos < 0)
 		return -EINVAL;
 
-	error = file->f_error;
-	if (error) {
+	rval = file->f_error;
+	if (rval) {
 		file->f_error = 0;
-		return error;
+		return rval;
 	}
 
 	/* We allow multiple direct writers in, there is no
@@ -137,16 +138,17 @@
 	if (unlikely(file->f_flags & O_DIRECT)) {
 		ioflags |= IO_ISDIRECT;
 		down_read(&inode->i_alloc_sem);
-		VOP_WRITE(vp, file, buf, count, &pos, ioflags, NULL, error);
+		VOP_WRITE(vp, file, buf, count, &pos, ioflags, NULL, rval);
 		*ppos = pos;
 		up_read(&inode->i_alloc_sem);
 	} else {
 		down(&inode->i_sem);
-		VOP_WRITE(vp, file, buf, count, &pos, ioflags, NULL, error);
+		VOP_WRITE(vp, file, buf, count, &pos, ioflags, NULL, rval);
 		*ppos = pos;
 		up(&inode->i_sem);
 	}
-	return error;
+
+	return rval;
 }
 
 STATIC inline ssize_t