From 4c925500dbcc4ade63d4556a9852ad3cbc9d9538 Mon Sep 17 00:00:00 2001
From: Sunil Mushran <sunil.mushran@oracle.com>
Date: Fri, 6 Nov 2009 14:50:22 -0800
Subject: [PATCH] --- yaml --- r: 168806 b: refs/heads/master c:
 7aee47b0bb9f93baecdbea205e878fe0f155f7da h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/ocfs2/ocfs2.h    | 7 +------
 trunk/fs/ocfs2/uptodate.c | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index c62fb20c769f..796eb9477bca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ab8f5244d6a8695688a91c8a3f6d3f40356ff97
+refs/heads/master: 7aee47b0bb9f93baecdbea205e878fe0f155f7da
diff --git a/trunk/fs/ocfs2/ocfs2.h b/trunk/fs/ocfs2/ocfs2.h
index eae404602424..d963d8638709 100644
--- a/trunk/fs/ocfs2/ocfs2.h
+++ b/trunk/fs/ocfs2/ocfs2.h
@@ -35,12 +35,7 @@
 #include <linux/kref.h>
 #include <linux/mutex.h>
 #include <linux/lockdep.h>
-#ifndef CONFIG_OCFS2_COMPAT_JBD
-# include <linux/jbd2.h>
-#else
-# include <linux/jbd.h>
-# include "ocfs2_jbd_compat.h"
-#endif
+#include <linux/jbd2.h>
 
 /* For union ocfs2_dlm_lksb */
 #include "stackglue.h"
diff --git a/trunk/fs/ocfs2/uptodate.c b/trunk/fs/ocfs2/uptodate.c
index b6284f235d2f..c61369342a27 100644
--- a/trunk/fs/ocfs2/uptodate.c
+++ b/trunk/fs/ocfs2/uptodate.c
@@ -53,11 +53,6 @@
 #include <linux/highmem.h>
 #include <linux/buffer_head.h>
 #include <linux/rbtree.h>
-#ifndef CONFIG_OCFS2_COMPAT_JBD
-# include <linux/jbd2.h>
-#else
-# include <linux/jbd.h>
-#endif
 
 #define MLOG_MASK_PREFIX ML_UPTODATE