summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2008-08-07 11:19:42 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:06 -0400
commit5036f53868ae943704ae69a192d21225dc914c35 (patch)
tree71d805b6f746b3bce571c8543d4972c01896b029 /fs/btrfs
parent5707e3b6f77e37bb8ecc7ba9d74c8bfc38011b6d (diff)
downloadop-kernel-dev-5036f53868ae943704ae69a192d21225dc914c35.zip
op-kernel-dev-5036f53868ae943704ae69a192d21225dc914c35.tar.gz
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>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/ctree.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index f90e5a7..c88f1e1 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
OpenPOWER on IntegriCloud