diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-19 23:29:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-19 23:29:05 -0500 |
| commit | 931ed94430e36b9bea3904572424116092ba5663 (patch) | |
| tree | 6ac8895f63ec90fdc2baddbd42bdc31da72e1e41 /fs/ocfs2/ocfs2.h | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 7aee47b0bb9f93baecdbea205e878fe0f155f7da (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: Trivial cleanup of jbd compatibility layer removal
ocfs2: Refresh documentation
ocfs2: return f_fsid info in ocfs2_statfs()
ocfs2: duplicate inline data properly during reflink.
ocfs2: Move ocfs2_complete_reflink to the right place.
ocfs2: Return -EINVAL when a device is not ocfs2.
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" |