These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lustre / llite / rw26.c

diff --git a/kernel/drivers/staging/lustre/lustre/llite/rw26.c b/kernel/drivers/staging/lustre/lustre/llite/rw26.c
index c6c8243..3da4c01 100644 (file)
--- a/kernel/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/kernel/drivers/staging/lustre/lustre/llite/rw26.c
@@ -200,12 +200,12 @@ static inline int ll_get_user_pages(int rw, unsigned long user_addr,
        *max_pages = (user_addr + size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
        *max_pages -= user_addr >> PAGE_CACHE_SHIFT;
 
-       OBD_ALLOC_LARGE(*pages, *max_pages * sizeof(**pages));
+       *pages = libcfs_kvzalloc(*max_pages * sizeof(**pages), GFP_NOFS);
        if (*pages) {
                result = get_user_pages_fast(user_addr, *max_pages,
                                             (rw == READ), *pages);
                if (unlikely(result <= 0))
-                       OBD_FREE_LARGE(*pages, *max_pages * sizeof(**pages));
+                       kvfree(*pages);
        }
 
        return result;
@@ -418,6 +418,7 @@ static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter,
                result = iov_iter_get_pages_alloc(iter, &pages, count, &offs);
                if (likely(result > 0)) {
                        int n = DIV_ROUND_UP(result + offs, PAGE_SIZE);
+
                        result = ll_direct_IO_26_seg(env, io, iov_iter_rw(iter),
                                                     inode, file->f_mapping,
                                                     result, file_offset, pages,
@@ -517,7 +518,6 @@ static int ll_migratepage(struct address_space *mapping,
 }
 #endif
 
-#ifndef MS_HAS_NEW_AOPS
 const struct address_space_operations ll_aops = {
        .readpage       = ll_readpage,
        .direct_IO      = ll_direct_IO_26,
@@ -532,22 +532,3 @@ const struct address_space_operations ll_aops = {
        .migratepage    = ll_migratepage,
 #endif
 };
-#else
-const struct address_space_operations_ext ll_aops = {
-       .orig_aops.readpage       = ll_readpage,
-/*     .orig_aops.readpages      = ll_readpages, */
-       .orig_aops.direct_IO      = ll_direct_IO_26,
-       .orig_aops.writepage      = ll_writepage,
-       .orig_aops.writepages     = ll_writepages,
-       .orig_aops.set_page_dirty = ll_set_page_dirty,
-       .orig_aops.prepare_write  = ll_prepare_write,
-       .orig_aops.commit_write   = ll_commit_write,
-       .orig_aops.invalidatepage = ll_invalidatepage,
-       .orig_aops.releasepage    = ll_releasepage,
-#ifdef CONFIG_MIGRATION
-       .orig_aops.migratepage    = ll_migratepage,
-#endif
-       .write_begin    = ll_write_begin,
-       .write_end      = ll_write_end
-};
-#endif