The patch titled
vectorize-aio_read-aio_write-methods-tidy
has been added to the -mm tree. Its filename is
vectorize-aio_read-aio_write-methods-tidy.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Andrew Morton <akpm@xxxxxxxx>
Sigh.
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Badari Pulavarty <pbadari@xxxxxxxxxx>
Cc: Benjamin LaHaise <bcrl@xxxxxxxxx>
Cc: Zach Brown <zab@xxxxxxxxx>
Cc: Mark Fasheh <mark.fasheh@xxxxxxxxxx>
Cc: Joel Becker <Joel.Becker@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfs/direct.c | 6 ++++--
fs/nfs/file.c | 12 ++++++++----
filesystems/Locking | 0
filesystems/vfs.txt | 0
char/raw.c | 0
usb/gadget/inode.c | 0
aio.c | 0
block_dev.c | 0
cifs/cifsfs.c | 0
ext3/file.c | 0
ntfs/file.c | 0
ocfs2/file.c | 0
read_write.c | 0
reiserfs/file.c | 0
xfs/linux-2.6/xfs_file.c | 0
linux/aio.h | 0
linux/fs.h | 0
linux/nfs_fs.h | 0
net/sock.h | 0
filemap.c | 0
socket.c | 0
21 files changed, 12 insertions(+), 6 deletions(-)
diff -puN Documentation/filesystems/Locking~vectorize-aio_read-aio_write-methods-tidy Documentation/filesystems/Locking
diff -puN Documentation/filesystems/vfs.txt~vectorize-aio_read-aio_write-methods-tidy Documentation/filesystems/vfs.txt
diff -puN drivers/char/raw.c~vectorize-aio_read-aio_write-methods-tidy drivers/char/raw.c
diff -puN drivers/usb/gadget/inode.c~vectorize-aio_read-aio_write-methods-tidy drivers/usb/gadget/inode.c
diff -puN fs/aio.c~vectorize-aio_read-aio_write-methods-tidy fs/aio.c
diff -puN fs/block_dev.c~vectorize-aio_read-aio_write-methods-tidy fs/block_dev.c
diff -puN fs/cifs/cifsfs.c~vectorize-aio_read-aio_write-methods-tidy fs/cifs/cifsfs.c
diff -puN fs/ext3/file.c~vectorize-aio_read-aio_write-methods-tidy fs/ext3/file.c
diff -puN fs/nfs/direct.c~vectorize-aio_read-aio_write-methods-tidy fs/nfs/direct.c
--- 25/fs/nfs/direct.c~vectorize-aio_read-aio_write-methods-tidy Thu May 11 11:53:45 2006
+++ 25-akpm/fs/nfs/direct.c Thu May 11 11:53:45 2006
@@ -763,7 +763,8 @@ static ssize_t nfs_direct_write(struct k
* client must read the updated atime from the server back into its
* cache.
*/
-ssize_t nfs_file_direct_read(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos)
+ssize_t nfs_file_direct_read(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos)
{
ssize_t retval = -EINVAL;
int page_count;
@@ -835,7 +836,8 @@ out:
* Note that O_APPEND is not supported for NFS direct writes, as there
* is no atomic O_APPEND write facility in the NFS protocol.
*/
-ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos)
+ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos)
{
ssize_t retval;
int page_count;
diff -puN fs/nfs/file.c~vectorize-aio_read-aio_write-methods-tidy fs/nfs/file.c
--- 25/fs/nfs/file.c~vectorize-aio_read-aio_write-methods-tidy Thu May 11 11:53:45 2006
+++ 25-akpm/fs/nfs/file.c Thu May 11 11:53:45 2006
@@ -43,8 +43,10 @@ static int nfs_file_release(struct inode
static loff_t nfs_file_llseek(struct file *file, loff_t offset, int origin);
static int nfs_file_mmap(struct file *, struct vm_area_struct *);
static ssize_t nfs_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *);
-static ssize_t nfs_file_read(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos);
-static ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos);
+static ssize_t nfs_file_read(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos);
+static ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos);
static int nfs_file_flush(struct file *, fl_owner_t id);
static int nfs_fsync(struct file *, struct dentry *dentry, int datasync);
static int nfs_check_flags(int flags);
@@ -214,7 +216,8 @@ nfs_file_flush(struct file *file, fl_own
return status;
}
-static ssize_t nfs_file_read(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos)
+static ssize_t nfs_file_read(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos)
{
struct dentry * dentry = iocb->ki_filp->f_dentry;
struct inode * inode = dentry->d_inode;
@@ -378,7 +381,8 @@ const struct address_space_operations nf
#endif
};
-static ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos)
+static ssize_t nfs_file_write(struct kiocb *iocb, const struct iovec *iov,
+ unsigned long nr_segs, loff_t pos)
{
struct dentry * dentry = iocb->ki_filp->f_dentry;
struct inode * inode = dentry->d_inode;
diff -puN fs/ntfs/file.c~vectorize-aio_read-aio_write-methods-tidy fs/ntfs/file.c
diff -puN fs/ocfs2/file.c~vectorize-aio_read-aio_write-methods-tidy fs/ocfs2/file.c
diff -puN fs/read_write.c~vectorize-aio_read-aio_write-methods-tidy fs/read_write.c
diff -puN fs/reiserfs/file.c~vectorize-aio_read-aio_write-methods-tidy fs/reiserfs/file.c
diff -puN fs/xfs/linux-2.6/xfs_file.c~vectorize-aio_read-aio_write-methods-tidy fs/xfs/linux-2.6/xfs_file.c
diff -puN include/linux/aio.h~vectorize-aio_read-aio_write-methods-tidy include/linux/aio.h
diff -puN include/linux/fs.h~vectorize-aio_read-aio_write-methods-tidy include/linux/fs.h
diff -puN include/linux/nfs_fs.h~vectorize-aio_read-aio_write-methods-tidy include/linux/nfs_fs.h
diff -puN include/net/sock.h~vectorize-aio_read-aio_write-methods-tidy include/net/sock.h
diff -puN mm/filemap.c~vectorize-aio_read-aio_write-methods-tidy mm/filemap.c
diff -puN net/socket.c~vectorize-aio_read-aio_write-methods-tidy net/socket.c
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
autofs4-nfy_none-wait-race-fix-tidy.patch
setup_per_zone_pages_min-overflow-fix.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
acpi-memory-hotplug-cannot-manage-_crs-with-plural-resoureces.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
powernow-k8-crash-workaround.patch
s3c24xx-hardware-spi-driver-tidy.patch
git-dvb.patch
git-gfs2.patch
via-pmu-add-input-device-tidy.patch
git-libata-all.patch
git-mtd.patch
git-netdev-all.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
git-powerpc.patch
git-rbtree.patch
git-sas.patch
git-serial.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-fix.patch
git-scsi-misc.patch
git-scsi-rc-fixes.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-watchdog.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
pgdat-allocation-for-new-node-add-specify-node-id-powerpc-fix.patch
pgdat-allocation-for-new-node-add-specify-node-id-tidy.patch
pgdat-allocation-for-new-node-add-specify-node-id-fix-3.patch
pgdat-allocation-for-new-node-add-get-node-id-by-acpi-tidy.patch
pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy.patch
pgdat-allocation-for-new-node-add-refresh-node_data-fix.patch
pgdat-allocation-for-new-node-add-export-kswapd-start-func-tidy.patch
catch-valid-mem-range-at-onlining-memory-tidy.patch
catch-valid-mem-range-at-onlining-memory-fix.patch
mm-introduce-remap_vmalloc_range-fix.patch
tracking-dirty-pages-in-shared-mappings-v4-fix2.patch
tracking-dirty-pages-in-shared-mappings-v4-fix3.patch
throttle-writers-of-shared-mappings-tidy.patch
acx1xx-wireless-driver.patch
dont-use-flush_tlb_all-in-suspend-time-tidy.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
percpu-counter-data-type-changes-to-suppport-fix.patch
connector-exports.patch
config_net=n-build-fix.patch
jbd-split-checkpoint-lists-tidy.patch
improve-randomness-of-hash_long-on-64bit-tidy.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
vectorize-aio_read-aio_write-methods-fix.patch
vectorize-aio_read-aio_write-methods-tidy.patch
hangcheck-remove-monotomic_clock-on-x86.patch
pi-futex-futex-code-cleanups-fix.patch
reiser4.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.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
