diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2009-11-06 17:50:22 -0500 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-11-13 18:45:05 -0500 |
| commit | 7aee47b0bb9f93baecdbea205e878fe0f155f7da (patch) | |
| tree | d2348e1ae5e7dabd0d4ec38479a7b7dba39d7332 /fs/ocfs2/ocfs2.h | |
| parent | 7ab8f5244d6a8695688a91c8a3f6d3f40356ff97 (diff) | |
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.h | 7 |
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 @@ | |||
| 35 | #include <linux/kref.h> | 35 | #include <linux/kref.h> |
| 36 | #include <linux/mutex.h> | 36 | #include <linux/mutex.h> |
| 37 | #include <linux/lockdep.h> | 37 | #include <linux/lockdep.h> |
| 38 | #ifndef CONFIG_OCFS2_COMPAT_JBD | 38 | #include <linux/jbd2.h> |
| 39 | # include <linux/jbd2.h> | ||
| 40 | #else | ||
| 41 | # include <linux/jbd.h> | ||
| 42 | # include "ocfs2_jbd_compat.h" | ||
| 43 | #endif | ||
| 44 | 39 | ||
| 45 | /* For union ocfs2_dlm_lksb */ | 40 | /* For union ocfs2_dlm_lksb */ |
| 46 | #include "stackglue.h" | 41 | #include "stackglue.h" |