From f38745549c08e7986fe7a300e5d5db0ae614ec62 Mon Sep 17 00:00:00 2001
From: Chris Mason <chris.mason@oracle.com>
Date: Thu, 24 Jul 2008 09:51:08 -0400
Subject: [PATCH] --- yaml --- r: 128844 b: refs/heads/master c:
 4881ee5a2e995c6a8999b56de70aa3834369d8ee h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/ctree.h   | 8 ++++++++
 trunk/fs/btrfs/locking.c | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 54d1698ad1d5..e07afa716aa2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89642229a582a5c2b6d2ed8ec16986387d9a9047
+refs/heads/master: 4881ee5a2e995c6a8999b56de70aa3834369d8ee
diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h
index 90504ba7f838..8ecac2e77a43 100644
--- a/trunk/fs/btrfs/ctree.h
+++ b/trunk/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/trunk/fs/btrfs/locking.c b/trunk/fs/btrfs/locking.c
index 27a02376ab14..d617c29787fa 100644
--- a/trunk/fs/btrfs/locking.c
+++ b/trunk/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"