Ver Fonte

Btrfs: Fix some build problems on 2.6.18 based enterprise kernels

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Chris Mason há 17 anos atrás
pai
commit
4881ee5a2e
2 ficheiros alterados com 9 adições e 1 exclusões
  1. 8 0
      fs/btrfs/ctree.h
  2. 1 1
      fs/btrfs/locking.c

+ 8 - 0
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,

+ 1 - 1
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"