LU-6032 ldlm: don't disable softirq for exp_rpc_lock

[fs/lustre-release.git] / lustre / include / lustre_patchless_compat.h

diff --git a/lustre/include/lustre_patchless_compat.h b/lustre/include/lustre_patchless_compat.h
index cefa869..2ad8bce 100644 (file)
--- a/lustre/include/lustre_patchless_compat.h
+++ b/lustre/include/lustre_patchless_compat.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -68,7 +64,7 @@ static inline void ll_remove_from_page_cache(struct page *page)
 static inline void ll_delete_from_page_cache(struct page *page)
 {
         ll_remove_from_page_cache(page);
-        page_cache_release(page);
+       put_page(page);
 }
 #else /* HAVE_DELETE_FROM_PAGE_CACHE */
 #define ll_delete_from_page_cache(page) delete_from_page_cache(page)
@@ -95,7 +91,7 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
 
        if (PagePrivate(page))
 #ifdef HAVE_INVALIDATE_RANGE
-               page->mapping->a_ops->invalidatepage(page, 0, PAGE_CACHE_SIZE);
+               page->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE);
 #else
                page->mapping->a_ops->invalidatepage(page, 0);
 #endif
@@ -135,4 +131,8 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
 #define ATTR_CTIME_SET (1 << 28)
 #endif
 
+#ifndef HAVE_IN_COMPAT_SYSCALL
+#define in_compat_syscall      is_compat_task
+#endif
+
 #endif /* LUSTRE_PATCHLESS_COMPAT_H */