diff options
| author | Chris Mason <chris.mason@oracle.com> | 2008-07-24 09:51:08 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:04:05 -0400 |
| commit | 4881ee5a2e995c6a8999b56de70aa3834369d8ee (patch) | |
| tree | bdc4e616fccb851656b16345b9bde8515ee4cff5 | |
| parent | 89642229a582a5c2b6d2ed8ec16986387d9a9047 (diff) | |
Btrfs: Fix some build problems on 2.6.18 based enterprise kernels
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -rw-r--r-- | fs/btrfs/ctree.h | 8 | ||||
| -rw-r--r-- | fs/btrfs/locking.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 90504ba7f838..8ecac2e77a43 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1595,6 +1595,14 @@ int btrfs_csum_truncate(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, u64 isize); /* inode.c */ + +/* RHEL and EL kernels have a patch that renames PG_checked to FsMisc */ +#ifdef ClearPageFsMisc +#define ClearPageChecked ClearPageFsMisc +#define SetPageChecked SetPageFsMisc +#define PageChecked PageFsMisc +#endif + int btrfs_writepages(struct address_space *mapping, struct writeback_control *wbc); int btrfs_create_subvol_root(struct btrfs_root *new_root, diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c index 27a02376ab14..d617c29787fa 100644 --- a/fs/btrfs/locking.c +++ b/fs/btrfs/locking.c @@ -20,7 +20,7 @@ #include <linux/pagemap.h> #include <linux/spinlock.h> #include <linux/page-flags.h> -#include <linux/bug.h> +#include <asm/bug.h> #include "ctree.h" #include "extent_io.h" #include "locking.h" |