summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/ocfs2.h
diff options
context:
space:
mode:
authorSunil Mushran <sunil.mushran@oracle.com>2009-11-06 14:50:22 -0800
committerJoel Becker <joel.becker@oracle.com>2009-11-13 15:45:05 -0800
commit7aee47b0bb9f93baecdbea205e878fe0f155f7da (patch)
treed2348e1ae5e7dabd0d4ec38479a7b7dba39d7332 /fs/ocfs2/ocfs2.h
parent7ab8f5244d6a8695688a91c8a3f6d3f40356ff97 (diff)
downloadlinux-7aee47b0bb9f93baecdbea205e878fe0f155f7da.tar.gz
linux-7aee47b0bb9f93baecdbea205e878fe0f155f7da.tar.bz2
linux-7aee47b0bb9f93baecdbea205e878fe0f155f7da.zip
ocfs2: Trivial cleanup of jbd compatibility layer removal
Mainline commit 53ef99cad9878f02f27bb30bc304fc42af8bdd6e removed the JBD compatibility layer from OCFS2. This patch removes the last remaining remnants of that. Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com> Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
-rw-r--r--fs/ocfs2/ocfs2.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index eae404602424..d963d8638709 100644
--- a/fs/ocfs2/ocfs2.h
+++ b/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"