Skip to contentSkip to conversation

ocfs2: Trivial cleanup of jbd compatibility layer removal

PATCH New Sunil Mushran 2 participants 2 messages Nov 6, 2009 – Nov 13, 2009 OCFS2

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 fs/ocfs2/ocfs2.h    |    7 +------
 fs/ocfs2/uptodate.c |    5 -----
 2 files changed, 1 insertions(+), 11 deletions(-)
fs/ocfs2/ocfs2.h +1 -6
index eae4046..d963d86 100644
@@ -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"
fs/ocfs2/uptodate.c +0 -5
index b6284f2..c613693 100644
@@ -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
 
Signature · 1 line
1.6.3.3
#1 lore raw

PATCH 1/1 ocfs2: Trivial cleanup of jbd compatibility layer removal

Quoted 5 lines · Sunil Mushran

Mainline commit 53ef99cad9878f02f27bb30bc304fc42af8bdd6e removed the JBD compatibility layer from OCFS2. This patch removes the last remaining remnants of that.

This patch is now in the "fixes" branch of ocfs2.git.

Joel

Signature · 9 lines
"I don't know anything about music. In my line you don't have
 to."
        - Elvis Presley

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127