Skip to content

Commit

Permalink
ocfs2: Trivial cleanup of jbd compatibility layer removal
Browse files Browse the repository at this point in the history 
Mainline commit 53ef99c 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>
  • Loading branch information
Sunil Mushran authored and Joel Becker committed Nov 13, 2009
1 parent 7ab8f52 commit 7aee47b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
7 changes: 1 addition & 6 deletions fs/ocfs2/ocfs2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 0 additions & 5 deletions fs/ocfs2/uptodate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 7aee47b

Please sign in to comment.