Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-artful-kernel.git] / fs / orangefs / inode.c

diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 0f586bded7f42f1c7ea41125c15fa16dafd9f242..2e63e6d0a68e514c423d85a5ea27c09f3062f55d 100644 (file)
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -80,7 +80,7 @@ static int orangefs_readpages(struct file *file,
                if (!add_to_page_cache(page,
                                       mapping,
                                       page->index,
-                                      GFP_KERNEL)) {
+                                      readahead_gfp_mask(mapping))) {
                        ret = read_one_page(page);
                        gossip_debug(GOSSIP_INODE_DEBUG,
                                "failure adding page to cache, read_one_page returned: %d\n",
@@ -124,19 +124,16 @@ static int orangefs_releasepage(struct page *page, gfp_t foo)
  * will need to be able to use O_DIRECT on open in order to support
  * AIO. Modeled after NFS, they do this too.
  */
-/*
- * static ssize_t orangefs_direct_IO(int rw,
- *                     struct kiocb *iocb,
- *                     struct iov_iter *iter,
- *                     loff_t offset)
- *{
- *     gossip_debug(GOSSIP_INODE_DEBUG,
- *                  "orangefs_direct_IO: %s\n",
- *                  iocb->ki_filp->f_path.dentry->d_name.name);
- *
- *     return -EINVAL;
- *}
- */
+
+static ssize_t orangefs_direct_IO(struct kiocb *iocb,
+                                 struct iov_iter *iter)
+{
+       gossip_debug(GOSSIP_INODE_DEBUG,
+                    "orangefs_direct_IO: %s\n",
+                    iocb->ki_filp->f_path.dentry->d_name.name);
+
+       return -EINVAL;
+}
 
 struct backing_dev_info orangefs_backing_dev_info = {
        .name = "orangefs",
@@ -150,7 +147,7 @@ const struct address_space_operations orangefs_address_operations = {
        .readpages = orangefs_readpages,
        .invalidatepage = orangefs_invalidatepage,
        .releasepage = orangefs_releasepage,
-/*     .direct_IO = orangefs_direct_IO */
+       .direct_IO = orangefs_direct_IO,
 };
 
 static int orangefs_setattr_size(struct inode *inode, struct iattr *iattr)