ocfs2: Trivial cleanup of jbd compatibility layer removal
authorSunil Mushran <sunil.mushran@oracle.com>
Fri, 6 Nov 2009 22:50:22 +0000 (14:50 -0800)
committerJoel Becker <joel.becker@oracle.com>
Fri, 13 Nov 2009 23:45:05 +0000 (15:45 -0800)
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>
fs/ocfs2/ocfs2.h
fs/ocfs2/uptodate.c

index eae4046024241131eb948a9d8539fc5158878c44..d963d863870994075b8af17c84484c09cb0b84d8 100644 (file)
 #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"
index b6284f235d2ff9e54e15834014ebc8f3e059851d..c61369342a276e17a6e35fcc79df544a2bd4419c 100644 (file)
 #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