X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_patchless_compat.h;h=b6070871e555cfa2839f33b10c7c9f729b3f103b;hb=478f97b212714bc3af9a9a104efab314ca942758;hp=644ab78cf01b6ffd132fae58801d288f4269e7a2;hpb=a259082d66ba482aa4044abd1b41ac4219585473;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_patchless_compat.h b/lustre/include/lustre_patchless_compat.h
index 644ab78..b607087 100644
--- 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)
@@ -115,26 +111,6 @@ truncate_complete_page(struct address_space *mapping, struct page *page)
 #  define ll_d_count(d)			((d)->d_count)
 #endif /* HAVE_DCACHE_LOCK */
 
-#ifdef ATTR_OPEN
-# define ATTR_FROM_OPEN ATTR_OPEN
-#else
-# ifndef ATTR_FROM_OPEN
-#  define ATTR_FROM_OPEN 0
-# endif
-#endif /* ATTR_OPEN */
-
-#ifndef ATTR_RAW
-#define ATTR_RAW 0
-#endif
-
-#ifndef ATTR_CTIME_SET
-/*
- * set ATTR_CTIME_SET to a high value to avoid any risk of collision with other
- * ATTR_* attributes (see bug 13828)
- */
-#define ATTR_CTIME_SET (1 << 28)
-#endif
-
 #ifndef HAVE_IN_COMPAT_SYSCALL
 #define in_compat_syscall	is_compat_task
 #endif