Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / fs / ntfs / file.c

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 39a1669506bd5ede117c16a504bb5d88ddf4db87..ffcc504a1667be04daea41339c53cd16d7ca84e4 100644 (file)
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -26,6 +26,7 @@
 #include <linux/swap.h>
 #include <linux/uio.h>
 #include <linux/writeback.h>
 #include <linux/swap.h>
 #include <linux/uio.h>
 #include <linux/writeback.h>

+#include <linux/sched.h>

 
 #include <asm/page.h>
 #include <asm/uaccess.h>
 
 #include <asm/page.h>
 #include <asm/uaccess.h>


@@ -2275,7 +2276,7 @@ const struct file_operations ntfs_file_ops = {
                                                    mounted filesystem. */
        .mmap           = generic_file_mmap,     /* Mmap file. */
        .open           = ntfs_file_open,        /* Open file. */
                                                    mounted filesystem. */
        .mmap           = generic_file_mmap,     /* Mmap file. */
        .open           = ntfs_file_open,        /* Open file. */

-       .sendfile       = generic_file_sendfile, /* Zero-copy data send with
+       .splice_read    = generic_file_splice_read /* Zero-copy data send with

                                                    the data source being on
                                                    the ntfs partition.  We do
                                                    not need to care about the
                                                    the data source being on
                                                    the ntfs partition.  We do
                                                    not need to care about the