X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_patchless_compat.h;h=d79d1c8c34cfde945ea335b8b1f6337526ece0b4;hp=36d41a394872bd36b6cea26ca6ed1ea830fd4e05;hb=d10c9e05ab593f361fdfd27842766a1924e63e58;hpb=4275694704e0fb82cd6980bec082cf358df0654c diff --git a/lustre/include/linux/lustre_patchless_compat.h b/lustre/include/linux/lustre_patchless_compat.h index 36d41a3..d79d1c8 100644 --- a/lustre/include/linux/lustre_patchless_compat.h +++ b/lustre/include/linux/lustre_patchless_compat.h @@ -1,29 +1,42 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright (C) 2002, 2003 Cluster File Systems, Inc. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * This file is part of Lustre, http://www.lustre.org. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * 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 * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * 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. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. * + * Copyright (c) 2011, Whamcloud, Inc. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #ifndef LUSTRE_PATCHLESS_COMPAT_H #define LUSTRE_PATCHLESS_COMPAT_H -#include #include #ifndef HAVE_TRUNCATE_COMPLETE_PAGE @@ -31,6 +44,16 @@ #include #include +#ifndef HAVE_CANCEL_DIRTY_PAGE /* 2.6.20 */ +#define cancel_dirty_page(page, size) clear_page_dirty(page) +#endif + +#ifndef HAVE_DELETE_FROM_PAGE_CACHE /* 2.6.39 */ +#ifndef HAVE_REMOVE_FROM_PAGE_CACHE /* 2.6.35 - 2.6.38 */ +#ifdef HAVE_NR_PAGECACHE /* 2.6.18 */ +#define __dec_zone_page_state(page, flag) atomic_add(-1, &nr_pagecache); +#endif /* HAVE_NR_PAGECACHE */ + /* XXX copy & paste from 2.6.15 kernel */ static inline void ll_remove_from_page_cache(struct page *page) { @@ -38,26 +61,34 @@ static inline void ll_remove_from_page_cache(struct page *page) BUG_ON(!PageLocked(page)); -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) +#ifdef HAVE_RW_TREE_LOCK write_lock_irq(&mapping->tree_lock); #else - spin_lock_irq(&mapping->tree_lock); + cfs_spin_lock_irq(&mapping->tree_lock); #endif radix_tree_delete(&mapping->page_tree, page->index); page->mapping = NULL; mapping->nrpages--; -#ifdef HAVE_NR_PAGECACHE - atomic_add(-1, &nr_pagecache); // XXX pagecache_acct(-1); -#else __dec_zone_page_state(page, NR_FILE_PAGES); -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)) +#ifdef HAVE_RW_TREE_LOCK write_unlock_irq(&mapping->tree_lock); #else - spin_unlock_irq(&mapping->tree_lock); + cfs_spin_unlock_irq(&mapping->tree_lock); #endif } +#else /* HAVE_REMOVE_FROM_PAGE_CACHE */ +#define ll_remove_from_page_cache(page) remove_from_page_cache(page) +#endif /* !HAVE_REMOVE_FROM_PAGE_CACHE */ + +static inline void ll_delete_from_page_cache(struct page *page) +{ + ll_remove_from_page_cache(page); + page_cache_release(page); +} +#else /* HAVE_DELETE_FROM_PAGE_CACHE */ +#define ll_delete_from_page_cache(page) delete_from_page_cache(page) +#endif /* !HAVE_DELETE_FROM_PAGE_CACHE */ static inline void truncate_complete_page(struct address_space *mapping, struct page *page) @@ -68,33 +99,18 @@ truncate_complete_page(struct address_space *mapping, struct page *page) if (PagePrivate(page)) page->mapping->a_ops->invalidatepage(page, 0); -#ifdef HAVE_CANCEL_DIRTY_PAGE cancel_dirty_page(page, PAGE_SIZE); -#else - clear_page_dirty(page); -#endif - ClearPageUptodate(page); ClearPageMappedToDisk(page); - ll_remove_from_page_cache(page); - page_cache_release(page); /* pagecache ref */ + ll_delete_from_page_cache(page); } -#endif /* HAVE_TRUNCATE_COMPLETE_PAGE */ +#endif /* !HAVE_TRUNCATE_COMPLETE_PAGE */ -#if !defined(HAVE_D_REHASH_COND) && !defined(HAVE___D_REHASH) -/* megahack */ -static inline void d_rehash_cond(struct dentry * entry, int lock) -{ - if (!lock) - spin_unlock(&dcache_lock); - - d_rehash(entry); - - if (!lock) - spin_lock(&dcache_lock); -} - -#define __d_rehash(dentry, lock) d_rehash_cond(dentry, lock) -#endif /* !HAVE_D_REHASH_COND && !HAVE___D_REHASH*/ +#ifdef HAVE_DCACHE_LOCK +# define dget_dlock(d) dget_locked(d) +# define d_refcount(d) atomic_read(&(d)->d_count) +#else +# define d_refcount(d) ((d)->d_count) +#endif /* HAVE_DCACHE_LOCK */ #ifdef ATTR_OPEN # define ATTR_FROM_OPEN ATTR_OPEN