Commit 7aee47b0 authored by Sunil Mushran's avatar Sunil Mushran Committed by Joel Becker
Browse files

ocfs2: Trivial cleanup of jbd compatibility layer removal 



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

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 7ab8f524

fs/ocfs2/ocfs2.h

+1 −6
Original line number Diff line number Diff line
@@ -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



/* For union ocfs2_dlm_lksb */

#include "stackglue.h"

fs/ocfs2/uptodate.c

+0 −5
Original line number Diff line number Diff line
@@ -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