From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 7 Aug 2008 15:19:42 +0000 (-0400)
Subject: Btrfs: fix RHEL test for ClearPageFsMisc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5036f53868ae943704ae69a192d21225dc914c35;p=linux-beck.git

Btrfs: fix RHEL test for ClearPageFsMisc

Newer RHEL5 kernels define both ClearPageFSMisc and
ClearPageChecked, so test for both before redefining.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index f90e5a7ac161..c88f1e16ce2d 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1648,7 +1648,7 @@ int btrfs_csum_truncate(struct btrfs_trans_handle *trans,
 /* inode.c */
 
 /* RHEL and EL kernels have a patch that renames PG_checked to FsMisc */
-#ifdef ClearPageFsMisc
+#if defined(ClearPageFsMisc) && !defined(ClearPageChecked)
 #define ClearPageChecked ClearPageFsMisc
 #define SetPageChecked SetPageFsMisc
 #define PageChecked PageFsMisc