Merge branch 'gate-page-refcount' (patches from Dave Hansen)

[linux.git] / fs / orangefs / file.c

diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index c740159d9ad11cb2788d93f0e2e0522322d88fc1..af375e049aae7794f71dd829678d2a601be0e2d2 100644 (file)
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -346,23 +346,8 @@ static ssize_t orangefs_file_read_iter(struct kiocb *iocb,
     struct iov_iter *iter)
 {
        int ret;
-       struct orangefs_read_options *ro;
-
        orangefs_stats.reads++;
 
-       /*
-        * Remember how they set "count" in read(2) or pread(2) or whatever -
-        * users can use count as a knob to control orangefs io size and later
-        * we can try to help them fill as many pages as possible in readpage.
-        */
-       if (!iocb->ki_filp->private_data) {
-               iocb->ki_filp->private_data = kmalloc(sizeof *ro, GFP_KERNEL);
-               if (!iocb->ki_filp->private_data)
-                       return(ENOMEM);
-               ro = iocb->ki_filp->private_data;
-               ro->blksiz = iter->count;
-       }
-
        down_read(&file_inode(iocb->ki_filp)->i_rwsem);
        ret = orangefs_revalidate_mapping(file_inode(iocb->ki_filp));
        if (ret)
@@ -650,12 +635,6 @@ static int orangefs_lock(struct file *filp, int cmd, struct file_lock *fl)
        return rc;
 }
 
-static int orangefs_file_open(struct inode * inode, struct file *file)
-{
-       file->private_data = NULL;
-       return generic_file_open(inode, file);
-}
-
 static int orangefs_flush(struct file *file, fl_owner_t id)
 {
        /*
@@ -666,19 +645,8 @@ static int orangefs_flush(struct file *file, fl_owner_t id)
         * on an explicit fsync call.  This duplicates historical OrangeFS
         * behavior.
         */
-       struct inode *inode = file->f_mapping->host;
        int r;
 
-       kfree(file->private_data);
-       file->private_data = NULL;
-
-       if (inode->i_state & I_DIRTY_TIME) {
-               spin_lock(&inode->i_lock);
-               inode->i_state &= ~I_DIRTY_TIME;
-               spin_unlock(&inode->i_lock);
-               mark_inode_dirty_sync(inode);
-       }
-
        r = filemap_write_and_wait_range(file->f_mapping, 0, LLONG_MAX);
        if (r > 0)
                return 0;
@@ -694,7 +662,7 @@ const struct file_operations orangefs_file_operations = {
        .lock           = orangefs_lock,
        .unlocked_ioctl = orangefs_ioctl,
        .mmap           = orangefs_file_mmap,
-       .open           = orangefs_file_open,
+       .open           = generic_file_open,
        .flush          = orangefs_flush,
        .release        = orangefs_file_release,
        .fsync          = orangefs_fsync,