LU-6215 llite: remove obsolete conditional code

[fs/lustre-release.git] / lustre / llite / rw26.c

diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index 83fa263..b362532 100644 (file)
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -88,7 +88,7 @@ static void ll_invalidatepage(struct page *vmpage,
         struct cl_page   *page;
         struct cl_object *obj;
 
-        int refcheck;
+       __u16 refcheck;
 
         LASSERT(PageLocked(vmpage));
         LASSERT(!PageWriteback(vmpage));
@@ -324,7 +324,7 @@ static void ll_free_user_pages(struct page **pages, int npages, int do_dirty)
 #if defined(HAVE_DIRECTIO_ITER) || defined(HAVE_IOV_ITER_RW)
        kvfree(pages);
 #else
-       OBD_FREE(pages, npages * sizeof(*pages));
+       OBD_FREE_LARGE(pages, npages * sizeof(*pages));
 #endif
 }
 
@@ -362,7 +362,7 @@ ll_direct_IO(
        ssize_t count = iov_iter_count(iter);
        ssize_t tot_bytes = 0, result = 0;
        size_t size = MAX_DIO_SIZE;
-       int refcheck;
+       __u16 refcheck;
 
        /* FIXME: io smaller than PAGE_SIZE is broken on ia64 ??? */
        if ((file_offset & ~PAGE_MASK) || (count & ~PAGE_MASK))
@@ -477,7 +477,7 @@ static inline int ll_get_user_pages(int rw, unsigned long user_addr,
                                        NULL);
                up_read(&current->mm->mmap_sem);
                if (unlikely(result <= 0))
-                       OBD_FREE(*pages, *max_pages * sizeof(**pages));
+                       OBD_FREE_LARGE(*pages, *max_pages * sizeof(**pages));
        }
 
        return result;
@@ -495,7 +495,7 @@ ll_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
        ssize_t tot_bytes = 0, result = 0;
        unsigned long seg = 0;
        size_t size = MAX_DIO_SIZE;
-       int refcheck;
+       __u16 refcheck;
        ENTRY;
 
         /* FIXME: io smaller than PAGE_SIZE is broken on ia64 ??? */
@@ -806,7 +806,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,
@@ -821,19 +820,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.direct_IO            = ll_direct_IO,
-       .orig_aops.writepage            = ll_writepage,
-       .orig_aops.writepages           = ll_writepages,
-       .orig_aops.set_page_dirty       = __set_page_dirty_nobuffers,
-       .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