The patch titled
Vectorize aio_read/aio_write methods (fix 2)
has been added to the -mm tree. Its filename is
streamline-generic_file_-interfaces-and-filemap-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Badari Pulavarty <pbadari@xxxxxxxxxx>
Missed to convert few filesystems not to use generic_file_read and
generic_file_write interfaces.
Signed-off-by: Badari Pulavarty <pbadari@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/smbfs/file.c | 4 ++--
fs/sysv/file.c | 6 ++++--
fs/udf/file.c | 6 ++++--
fs/ufs/file.c | 6 ++++--
4 files changed, 14 insertions(+), 8 deletions(-)
diff -puN fs/smbfs/file.c~streamline-generic_file_-interfaces-and-filemap-fix fs/smbfs/file.c
--- devel/fs/smbfs/file.c~streamline-generic_file_-interfaces-and-filemap-fix 2006-05-11 16:16:31.000000000 -0700
+++ devel-akpm/fs/smbfs/file.c 2006-05-11 16:16:31.000000000 -0700
@@ -233,7 +233,7 @@ smb_file_read(struct file * file, char _
(long)dentry->d_inode->i_size,
dentry->d_inode->i_flags, dentry->d_inode->i_atime);
- status = generic_file_read(file, buf, count, ppos);
+ status = do_sync_read(file, buf, count, ppos);
out:
return status;
}
@@ -338,7 +338,7 @@ smb_file_write(struct file *file, const
goto out;
if (count > 0) {
- result = generic_file_write(file, buf, count, ppos);
+ result = do_sync_write(file, buf, count, ppos);
VERBOSE("pos=%ld, size=%ld, mtime=%ld, atime=%ld\n",
(long) file->f_pos, (long) dentry->d_inode->i_size,
dentry->d_inode->i_mtime, dentry->d_inode->i_atime);
diff -puN fs/sysv/file.c~streamline-generic_file_-interfaces-and-filemap-fix fs/sysv/file.c
--- devel/fs/sysv/file.c~streamline-generic_file_-interfaces-and-filemap-fix 2006-05-11 16:16:31.000000000 -0700
+++ devel-akpm/fs/sysv/file.c 2006-05-11 16:16:31.000000000 -0700
@@ -21,8 +21,10 @@
*/
const struct file_operations sysv_file_operations = {
.llseek = generic_file_llseek,
- .read = generic_file_read,
- .write = generic_file_write,
+ .read = do_sync_read,
+ .aio_read = generic_file_aio_read,
+ .write = do_sync_write,
+ .aio_write = generic_file_aio_write,
.mmap = generic_file_mmap,
.fsync = sysv_sync_file,
.sendfile = generic_file_sendfile,
diff -puN fs/udf/file.c~streamline-generic_file_-interfaces-and-filemap-fix fs/udf/file.c
--- devel/fs/udf/file.c~streamline-generic_file_-interfaces-and-filemap-fix 2006-05-11 16:16:31.000000000 -0700
+++ devel-akpm/fs/udf/file.c 2006-05-11 16:16:31.000000000 -0700
@@ -136,7 +136,7 @@ static ssize_t udf_file_write(struct fil
}
}
- retval = generic_file_write(file, buf, count, ppos);
+ retval = do_sync_write(file, buf, count, ppos);
if (retval > 0)
mark_inode_dirty(inode);
@@ -249,11 +249,13 @@ static int udf_release_file(struct inode
}
const struct file_operations udf_file_operations = {
- .read = generic_file_read,
+ .read = do_sync_read,
+ .aio_read = generic_file_aio_read,
.ioctl = udf_ioctl,
.open = generic_file_open,
.mmap = generic_file_mmap,
.write = udf_file_write,
+ .aio_write = generic_file_aio_write,
.release = udf_release_file,
.fsync = udf_fsync_file,
.sendfile = generic_file_sendfile,
diff -puN fs/ufs/file.c~streamline-generic_file_-interfaces-and-filemap-fix fs/ufs/file.c
--- devel/fs/ufs/file.c~streamline-generic_file_-interfaces-and-filemap-fix 2006-05-11 16:16:31.000000000 -0700
+++ devel-akpm/fs/ufs/file.c 2006-05-11 16:16:31.000000000 -0700
@@ -33,8 +33,10 @@
const struct file_operations ufs_file_operations = {
.llseek = generic_file_llseek,
- .read = generic_file_read,
- .write = generic_file_write,
+ .read = do_sync_read,
+ .aio_read = generic_file_aio_read,
+ .write = do_sync_write,
+ .aio_write = generic_file_aio_write,
.mmap = generic_file_mmap,
.open = generic_file_open,
.sendfile = generic_file_sendfile,
_
Patches currently in -mm which might be from pbadari@xxxxxxxxxx are
vectorize-aio_read-aio_write-methods.patch
vectorize-aio_read-aio_write-methods-fix.patch
vectorize-aio_read-aio_write-methods-tidy.patch
remove-readv-writev-methods-and-use-aio_read-aio_write.patch
remove-readv-writev-methods-and-use-aio_read-aio_write-tidy.patch
core-aio-changes-to-support-vectored-aio.patch
core-aio-changes-to-support-vectored-aio-tidy-1.patch
streamline-generic_file_-interfaces-and-filemap.patch
streamline-generic_file_-interfaces-and-filemap-fix.patch
vectorize-aio_read-aio_write-methods-fix-2.patch
ext3-add-o-bh-option.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
