patch-2.3.9 linux/fs/read_write.c

• Lines: 87
• Date: Mon Jun 28 13:31:07 1999
• Orig file: v2.3.8/linux/fs/read_write.c
• Orig date: Wed Jun 16 19:26:27 1999

diff -u --recursive --new-file v2.3.8/linux/fs/read_write.c linux/fs/read_write.c
@@ -117,28 +117,22 @@
 {
 	ssize_t ret;
 	struct file * file;
-	ssize_t (*read)(struct file *, char *, size_t, loff_t *);
-
-	lock_kernel();
 
 	ret = -EBADF;
 	file = fget(fd);
-	if (!file)
-		goto bad_file;
-	if (!(file->f_mode & FMODE_READ))
-		goto out;
-	ret = locks_verify_area(FLOCK_VERIFY_READ, file->f_dentry->d_inode,
-				file, file->f_pos, count);
-	if (ret)
-		goto out;
-	ret = -EINVAL;
-	if (!file->f_op || !(read = file->f_op->read))
-		goto out;
-	ret = read(file, buf, count, &file->f_pos);
-out:
-	fput(file);
-bad_file:
-	unlock_kernel();
+	if (file) {
+		if (file->f_mode & FMODE_READ) {
+			ret = locks_verify_area(FLOCK_VERIFY_READ, file->f_dentry->d_inode,
+						file, file->f_pos, count);
+			if (!ret) {
+				ssize_t (*read)(struct file *, char *, size_t, loff_t *);
+				ret = -EINVAL;
+				if (file->f_op && (read = file->f_op->read) != NULL)
+					ret = read(file, buf, count, &file->f_pos);
+			}
+		}
+		fput(file);
+	}
 	return ret;
 }
 
@@ -146,31 +140,23 @@
 {
 	ssize_t ret;
 	struct file * file;
-	struct inode * inode;
-	ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
-
-	lock_kernel();
 
 	ret = -EBADF;
 	file = fget(fd);
-	if (!file)
-		goto bad_file;
-	if (!(file->f_mode & FMODE_WRITE))
-		goto out;
-	inode = file->f_dentry->d_inode;
-	ret = locks_verify_area(FLOCK_VERIFY_WRITE, inode, file,
+	if (file) {
+		if (file->f_mode & FMODE_WRITE) {
+			struct inode *inode = file->f_dentry->d_inode;
+			ret = locks_verify_area(FLOCK_VERIFY_WRITE, inode, file,
 				file->f_pos, count);
-	if (ret)
-		goto out;
-	ret = -EINVAL;
-	if (!file->f_op || !(write = file->f_op->write))
-		goto out;
-
-	ret = write(file, buf, count, &file->f_pos);
-out:
-	fput(file);
-bad_file:
-	unlock_kernel();
+			if (!ret) {
+				ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
+				ret = -EINVAL;
+				if (file->f_op && (write = file->f_op->write) != NULL)
+					ret = write(file, buf, count, &file->f_pos);
+			}
+		}
+		fput(file);
+	}
 	return ret;
 }