Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / fs / ext3 / file.c

diff --git a/fs/ext3/file.c b/fs/ext3/file.c
index 1efefb630ea971dae9728b32ac8beace5ad79187..1e6f13864536e7180a465ace2ce6555256d7292f 100644 (file)
--- a/fs/ext3/file.c
+++ b/fs/ext3/file.c
@@ -48,14 +48,15 @@ static int ext3_release_file (struct inode * inode, struct file * filp)
 }
 
 static ssize_t
-ext3_file_write(struct kiocb *iocb, const char __user *buf, size_t count, loff_t pos)
+ext3_file_write(struct kiocb *iocb, const struct iovec *iov,
+               unsigned long nr_segs, loff_t pos)
 {
        struct file *file = iocb->ki_filp;
-       struct inode *inode = file->f_dentry->d_inode;
+       struct inode *inode = file->f_path.dentry->d_inode;
        ssize_t ret;
        int err;
 
-       ret = generic_file_aio_write(iocb, buf, count, pos);
+       ret = generic_file_aio_write(iocb, iov, nr_segs, pos);
 
        /*
         * Skip flushing if there was an error, or if nothing was written.
@@ -100,7 +101,7 @@ ext3_file_write(struct kiocb *iocb, const char __user *buf, size_t count, loff_t
 
 force_commit:
        err = ext3_force_commit(inode->i_sb);
-       if (err) 
+       if (err)
                return err;
        return ret;
 }
@@ -111,9 +112,10 @@ const struct file_operations ext3_file_operations = {
        .write          = do_sync_write,
        .aio_read       = generic_file_aio_read,
        .aio_write      = ext3_file_write,
-       .readv          = generic_file_readv,
-       .writev         = generic_file_writev,
        .ioctl          = ext3_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = ext3_compat_ioctl,
+#endif
        .mmap           = generic_file_mmap,
        .open           = generic_file_open,
        .release        = ext3_release_file,
@@ -123,7 +125,7 @@ const struct file_operations ext3_file_operations = {
        .splice_write   = generic_file_splice_write,
 };
 
-struct inode_operations ext3_file_inode_operations = {
+const struct inode_operations ext3_file_inode_operations = {
        .truncate       = ext3_truncate,
        .setattr        = ext3_setattr,
 #ifdef CONFIG_EXT3_FS_XATTR