Skip to contentSkip to conversation

ext3: move headers out of include/linux

RFC PATCH In review Theodore Ts'o 4 participants 5 messages May 1, 2008 – May 3, 2008

lore
Share & tools
lore

Theodore Ts'o

author
#0 lore raw

RFC PATCH 1/1 ext3: move headers out of include/linux

Move ext3 headers out of include/linux. Cristoph promised to do this once the ext4 patch was accepted, but I figured I'd do him a favor and and do it for him. :-)

People are angsting heavily over patches not going through linux-next or -mm first on LKML at the moment, but this is a simple patch (just moving header files around and adjusting #include's), so I'd like to get a sense if this is something Linus would accept at this point. It would be nice to keep ext3 and ext4 in synch as much as possible, but it's not the end of the world if this misses the merge window and we don't do this until 2.6.27's merge window.

Secondly, Christoph, was there a reason why you didn't unpublish ext2_fs.h when you unpublished ext3_fs.h? Are there a significant number of userspace prorams using it? I don't care, because e2fsprogs doesn't use it, and as far as I'm concerned I'd much rather encourage people to use ext2fs/ext2_fs.h from e2fsprogs instead. And this would allow us to do a similar patch for fs/ext2; but assume you had found some significant number of applications that would break if we unexported and moved linux/ext2_fs.h?

Cc Christoph Hellwig <[email protected]>
Signed-off-by "Theodore Ts'o" <[email protected]>
---
 fs/ext3/acl.c              |    4 +-
 fs/ext3/balloc.c           |    5 +-
 fs/ext3/bitmap.c           |    2 +-
 fs/ext3/dir.c              |    3 +-
 fs/ext3/ext3.h             |  897 ++++++++++++++++++++++++++++++++++++++++++++
 fs/ext3/ext3_i.h           |  147 ++++++++
 fs/ext3/ext3_jbd.c         |    7 +-
 fs/ext3/ext3_jbd.h         |  225 +++++++++++
 fs/ext3/ext3_sb.h          |   86 +++++
 fs/ext3/file.c             |    5 +-
 fs/ext3/fsync.c            |    5 +-
 fs/ext3/hash.c             |    3 +-
 fs/ext3/ialloc.c           |    5 +-
 fs/ext3/inode.c            |    4 +-
 fs/ext3/ioctl.c            |    5 +-
 fs/ext3/namei.c            |    5 +-
 fs/ext3/resize.c           |    6 +-
 fs/ext3/super.c            |    5 +-
 fs/ext3/symlink.c          |    3 +-
 fs/ext3/xattr.c            |    4 +-
 fs/ext3/xattr_security.c   |    4 +-
 fs/ext3/xattr_trusted.c    |    4 +-
 fs/ext3/xattr_user.c       |    5 +-
 include/linux/ext3_fs.h    |  896 -------------------------------------------
 include/linux/ext3_fs_i.h  |  147 --------
 include/linux/ext3_fs_sb.h |   86 -----
 include/linux/ext3_jbd.h   |  226 -----------
 27 files changed, 1395 insertions(+), 1399 deletions(-)
 create mode 100644 fs/ext3/ext3.h
 create mode 100644 fs/ext3/ext3_i.h
 create mode 100644 fs/ext3/ext3_jbd.h
 create mode 100644 fs/ext3/ext3_sb.h
 delete mode 100644 include/linux/ext3_fs.h
 delete mode 100644 include/linux/ext3_fs_i.h
 delete mode 100644 include/linux/ext3_fs_sb.h
 delete mode 100644 include/linux/ext3_jbd.h
fs/ext3/acl.c +2 -2
index a754d18..82e90dd 100644
@@ -9,8 +9,8 @@
 #include <linux/slab.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 #include "acl.h"
fs/ext3/balloc.c +2 -3
index 92fd033..1905a56 100644
@@ -14,11 +14,10 @@
 #include <linux/time.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
fs/ext3/bitmap.c +1 -1
index 6afc39d..aff8a6f 100644
@@ -9,7 +9,7 @@
 
 #include <linux/buffer_head.h>
 #include <linux/jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
 
 #ifdef EXT3FS_DEBUG
fs/ext3/dir.c +1 -2
index 8ca3bfd..4462774 100644
@@ -22,11 +22,10 @@
  */
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/buffer_head.h>
 #include <linux/slab.h>
 #include <linux/rbtree.h>
+#include "ext3.h"
 
 static unsigned char ext3_filetype_table[] = {
 	DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK
fs/ext3/ext3.h new file +897 -0

897 lines not on this page · raw message

fs/ext3/ext3_i.h new file +147 -0

147 lines not on this page · raw message

fs/ext3/ext3_jbd.c +6 -1
index d401f14..2dd32b4 100644
@@ -2,7 +2,12 @@
  * Interface between ext3 and JBD
  */
 
-#include <linux/ext3_jbd.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/slab.h>
+
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 int __ext3_journal_get_undo_access(const char *where, handle_t *handle,
 				struct buffer_head *bh)
fs/ext3/ext3_jbd.h new file +225 -0

225 lines not on this page · raw message

fs/ext3/ext3_sb.h new file +86 -0

86 lines not on this page · raw message

fs/ext3/file.c +2 -3
index acc4913..9d57f8e 100644
@@ -20,9 +20,8 @@
 
 #include <linux/time.h>
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 #include "acl.h"
fs/ext3/fsync.c +2 -3
index d336341..a785985 100644
@@ -26,9 +26,8 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/writeback.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 /*
  * akpm: A new design for ext3_sync_file().
fs/ext3/hash.c +1 -2
index c30e149..9433d53 100644
@@ -10,9 +10,8 @@
  */
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/cryptohash.h>
+#include "ext3.h"
 
 #define DELTA 0x9E3779B9
fs/ext3/ialloc.c +2 -3
index 7712682..34daa2b 100644
@@ -14,15 +14,14 @@
 
 #include <linux/time.h>
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/random.h>
 #include <linux/bitops.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 #include <asm/byteorder.h>
fs/ext3/inode.c +2 -2
index 6ae4ecf..beb8569 100644
@@ -25,8 +25,6 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/time.h>
-#include <linux/ext3_jbd.h>
-#include <linux/jbd.h>
 #include <linux/highuid.h>
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>

@@ -36,6 +34,8 @@
 #include <linux/mpage.h>
 #include <linux/uio.h>
 #include <linux/bio.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 #include "acl.h"
fs/ext3/ioctl.c +2 -3
index 0d0c701..0f3d04c 100644
@@ -8,15 +8,14 @@
  */
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
 #include <linux/capability.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
 #include <linux/mount.h>
 #include <linux/time.h>
 #include <linux/compat.h>
 #include <linux/smp_lock.h>
 #include <asm/uaccess.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
 		unsigned long arg)
fs/ext3/namei.c +2 -3
index 0b8cf80..2bbcc6d 100644
@@ -26,16 +26,15 @@
 
 #include <linux/fs.h>
 #include <linux/pagemap.h>
-#include <linux/jbd.h>
 #include <linux/time.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
 #include <linux/fcntl.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/bio.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 #include "namei.h"
 #include "xattr.h"
fs/ext3/resize.c +3 -3
index 28cfd0b..7c8c55f 100644
@@ -11,11 +11,11 @@
 
 #define EXT3FS_DEBUG
 
-#include <linux/ext3_jbd.h>
-
 #include <linux/errno.h>
+#include <linux/fs.h>
 #include <linux/slab.h>
-
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 #define outside(b, first, last)	((b) < (first) || (b) >= (last))
 #define inside(b, first, last)	((b) >= (first) && (b) < (last))
fs/ext3/super.c +2 -3
index fe3119a..e77bb36 100644
@@ -20,9 +20,6 @@
 #include <linux/string.h>
 #include <linux/fs.h>
 #include <linux/time.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>

@@ -37,6 +34,8 @@
 #include <linux/quotaops.h>
 #include <linux/seq_file.h>
 #include <linux/log2.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 #include <asm/uaccess.h>
fs/ext3/symlink.c +1 -2
index ff7b4cc..44b6185 100644
@@ -18,9 +18,8 @@
  */
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/namei.h>
+#include "ext3.h"
 #include "xattr.h"
 
 static void * ext3_follow_link(struct dentry *dentry, struct nameidata *nd)
fs/ext3/xattr.c +2 -2
index d4a4f0e..5b2eb4a 100644
@@ -53,11 +53,11 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/mbcache.h>
 #include <linux/quotaops.h>
 #include <linux/rwsem.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 #include "acl.h"
fs/ext3/xattr_security.c +2 -2
index 821efaf..afa6f4b 100644
@@ -6,8 +6,8 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include <linux/security.h>
 #include "xattr.h"
fs/ext3/xattr_trusted.c +2 -2
index 0327497..75bceb3 100644
@@ -9,8 +9,8 @@
 #include <linux/string.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 
 #define XATTR_TRUSTED_PREFIX "trusted."
fs/ext3/xattr_user.c +3 -2
index 1abd8f9..7a70e96 100644
@@ -5,11 +5,12 @@
  * Copyright (C) 2001 by Andreas Gruenbacher, <[email protected]>
  */
 
+#include <linux/init.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 
 #define XATTR_USER_PREFIX "user."
include/linux/ext3_fs.h deleted +0 -896

896 lines not on this page · raw message

include/linux/ext3_fs_i.h deleted +0 -147

147 lines not on this page · raw message

include/linux/ext3_fs_sb.h deleted +0 -86

86 lines not on this page · raw message

include/linux/ext3_jbd.h deleted +0 -226

226 lines not on this page · raw message

Signature · 1 line
1.5.4.1.144.gdfee-dirty
#1 lore raw
Quoted 8 lines · Theodore Ts'o

Secondly, Christoph, was there a reason why you didn't unpublish ext2_fs.h when you unpublished ext3_fs.h? Are there a significant number of userspace prorams using it? I don't care, because e2fsprogs doesn't use it, and as far as I'm concerned I'd much rather encourage people to use ext2fs/ext2_fs.h from e2fsprogs instead. And this would allow us to do a similar patch for fs/ext2; but assume you had found some significant number of applications that would break if we unexported and moved linux/ext2_fs.h?

ext2_fs.h has been there for much longer, and unlike ext3_fs.h it actually is useable by userpsace. Of course everyone should be using the headers from e2fsprogs by now, but I'm not sure if that's really the case.

In past cases like that Olaf did greps over the whole OpenSuSE tree, so maybe he could do it for this aswell?

#2 lore raw
Quoted 10 lines · Christoph Hellwig
Quoted 8 lines · Theodore Ts'o

Secondly, Christoph, was there a reason why you didn't unpublish ext2_fs.h when you unpublished ext3_fs.h? Are there a significant number of userspace prorams using it? I don't care, because e2fsprogs doesn't use it, and as far as I'm concerned I'd much rather encourage people to use ext2fs/ext2_fs.h from e2fsprogs instead. And this would allow us to do a similar patch for fs/ext2; but assume you had found some significant number of applications that would break if we unexported and moved linux/ext2_fs.h?

Quoted 7 lines

ext2_fs.h has been there for much longer, and unlike ext3_fs.h it actually is useable by userpsace. Of course everyone should be using the headers from e2fsprogs by now, but I'm not sure if that's really the case.

In past cases like that Olaf did greps over the whole OpenSuSE tree, so maybe he could do it for this aswell?

29 packages (out of 3123) contain the string linux/ext2_fs.h. Most of them test for either ext2fs/ext2_fs.h or linux/ext2_fs.h. The following have linux/ext2_fs.h hardcoded:

pam_mktemp-1.0.3
sash-3.7
socat-1.6.0.1
arcboot-0.3.2 (for mips dvhtool)

All of them can be fixed.
I suggest to drop that header.

Olaf

#3 lore raw
In reply to Theodore Ts'o
Quoted 20 lines · Theodore Ts'o
 fs/ext3/acl.c              |    4 +-
 fs/ext3/balloc.c           |    5 +-
 fs/ext3/bitmap.c           |    2 +-
 fs/ext3/dir.c              |    3 +-
 fs/ext3/ext3.h             |  897 ++++++++++++++++++++++++++++++++++++++++++++
 fs/ext3/ext3_i.h           |  147 ++++++++
 fs/ext3/ext3_jbd.c         |    7 +-
 fs/ext3/ext3_jbd.h         |  225 +++++++++++
 fs/ext3/ext3_sb.h          |   86 +++++
 fs/ext3/file.c             |    5 +-
 fs/ext3/fsync.c            |    5 +-
 fs/ext3/hash.c             |    3 +-
 fs/ext3/ialloc.c           |    5 +-
 fs/ext3/inode.c            |    4 +-
 fs/ext3/ioctl.c            |    5 +-
 fs/ext3/namei.c            |    5 +-
 fs/ext3/resize.c           |    6 +-
 fs/ext3/super.c            |    5 +-
 fs/ext3/symlink.c          |    3 +-
Quoted 8 lines
 fs/ext3/xattr.c            |    4 +-
 fs/ext3/xattr_security.c   |    4 +-
 fs/ext3/xattr_trusted.c    |    4 +-
 fs/ext3/xattr_user.c       |    5 +-
 include/linux/ext3_fs.h    |  896 -------------------------------------------
 include/linux/ext3_fs_i.h  |  147 --------
 include/linux/ext3_fs_sb.h |   86 -----
 include/linux/ext3_jbd.h   |  226 -----------

I'd suggest not sending out patches like this.

If the patch is largely a rename one, and sent out for review, just use "git diff -M -p --stat --summary", because it's going to be a *lot* more reviewable that way.

Yeah, it means that people need git to apply it, but by now we can probably take that for granted - and more importantly, even if they don't have git installed: when you send out of RFC, aren't you looking for commentary more than people to apply and test it?

And then the patch saying that it's a rename (with perhaps changes to the guard #ifdef thing) would be a lot more clear. Nobody is going to read a patch that is 2800 lines of mostly create/delete with presumably almost no actual changes?

Linus

author
#4 lore raw
Quoted 5 lines · Linus Torvalds

I'd suggest not sending out patches like this.

If the patch is largely a rename one, and sent out for review, just use "git diff -M -p --stat --summary", because it's going to be a *lot* more reviewable that way.

Um, yeah, good point. I've added diff.renames=copies to my .gitconfig file, because it really is much easier to review.

Is this better, and would you be willing to apply this at this point in the merge cycle?

- Ted

Quoted 1 line

From f149cd2c06eb8611afd254cb56e764815fe2dc7f Mon Sep 17 00:00:00 2001

From: Theodore Ts'o <[email protected]>
Date: Wed, 30 Apr 2008 23:06:56 -0400
Subject: [PATCH] ext3: move headers out of include/linux

Move ext3 headers out of include/linux. Cristoph promised to do this once the ext4 patch was accepted, but I figured I'd do him a favor and do it for him.

Cc Christoph Hellwig <[email protected]>
Signed-off-by "Theodore Ts'o" <[email protected]>
---
 fs/ext3/acl.c                                   |    4 ++--
 fs/ext3/balloc.c                                |    5 ++---
 fs/ext3/bitmap.c                                |    2 +-
 fs/ext3/dir.c                                   |    3 +--
 include/linux/ext3_fs.h => fs/ext3/ext3.h       |    7 ++++---
 include/linux/ext3_fs_i.h => fs/ext3/ext3_i.h   |    0 
 fs/ext3/ext3_jbd.c                              |    3 ++-
 {include/linux => fs/ext3}/ext3_jbd.h           |    1 -
 include/linux/ext3_fs_sb.h => fs/ext3/ext3_sb.h |    0 
 fs/ext3/file.c                                  |    5 ++---
 fs/ext3/fsync.c                                 |    5 ++---
 fs/ext3/hash.c                                  |    3 +--
 fs/ext3/ialloc.c                                |    5 ++---
 fs/ext3/inode.c                                 |    4 ++--
 fs/ext3/ioctl.c                                 |    5 ++---
 fs/ext3/namei.c                                 |    5 ++---
 fs/ext3/resize.c                                |    5 ++---
 fs/ext3/super.c                                 |    5 ++---
 fs/ext3/symlink.c                               |    3 +--
 fs/ext3/xattr.c                                 |    4 ++--
 fs/ext3/xattr_security.c                        |    4 ++--
 fs/ext3/xattr_trusted.c                         |    4 ++--
 fs/ext3/xattr_user.c                            |    4 ++--
 23 files changed, 38 insertions(+), 48 deletions(-)
fs/ext3/acl.c +2 -2
index a754d18..82e90dd 100644
@@ -9,8 +9,8 @@
 #include <linux/slab.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 #include "acl.h"
fs/ext3/balloc.c +2 -3
index 92fd033..1905a56 100644
@@ -14,11 +14,10 @@
 #include <linux/time.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
fs/ext3/bitmap.c +1 -1
index 6afc39d..aff8a6f 100644
@@ -9,7 +9,7 @@
 
 #include <linux/buffer_head.h>
 #include <linux/jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
 
 #ifdef EXT3FS_DEBUG
fs/ext3/dir.c +1 -2
index 8ca3bfd..4462774 100644
@@ -22,11 +22,10 @@
  */
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/buffer_head.h>
 #include <linux/slab.h>
 #include <linux/rbtree.h>
+#include "ext3.h"
 
 static unsigned char ext3_filetype_table[] = {
 	DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK
fs/ext3/ext3.h renamed from include/linux/ext3_fs.h +4 -3
similarity index 99%
rename from include/linux/ext3_fs.h
rename to fs/ext3/ext3.h
index 36c5403..ac02b7f 100644
@@ -1,5 +1,5 @@
 /*
- *  linux/include/linux/ext3_fs.h
+ *  ext3.h
  *
  * Copyright (C) 1992, 1993, 1994, 1995
  * Remy Card ([email protected])

@@ -18,6 +18,7 @@
 
 #include <linux/types.h>
 #include <linux/magic.h>
+#include <linux/jbd.h>
 
 /*
  * The second extended filesystem constants/structures

@@ -491,8 +492,8 @@ struct ext3_super_block {
 };
 
 #ifdef __KERNEL__
-#include <linux/ext3_fs_i.h>
-#include <linux/ext3_fs_sb.h>
+#include "ext3_i.h"
+#include "ext3_sb.h"
 static inline struct ext3_sb_info * EXT3_SB(struct super_block *sb)
 {
 	return sb->s_fs_info;
fs/ext3/ext3_i.h renamed from include/linux/ext3_fs_i.h +0 -0
similarity index 100%
rename from include/linux/ext3_fs_i.h
rename to fs/ext3/ext3_i.h
fs/ext3/ext3_jbd.c +2 -1
index d401f14..7611de3 100644
@@ -2,7 +2,8 @@
  * Interface between ext3 and JBD
  */
 
-#include <linux/ext3_jbd.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 int __ext3_journal_get_undo_access(const char *where, handle_t *handle,
 				struct buffer_head *bh)
fs/ext3/ext3_jbd.h renamed from include/linux/ext3_jbd.h +0 -1
similarity index 99%
rename from include/linux/ext3_jbd.h
rename to fs/ext3/ext3_jbd.h
index 8c43b13..aadbdef 100644
@@ -17,7 +17,6 @@
 
 #include <linux/fs.h>
 #include <linux/jbd.h>
-#include <linux/ext3_fs.h>
 
 #define EXT3_JOURNAL(inode)	(EXT3_SB((inode)->i_sb)->s_journal)
fs/ext3/ext3_sb.h renamed from include/linux/ext3_fs_sb.h +0 -0
similarity index 100%
rename from include/linux/ext3_fs_sb.h
rename to fs/ext3/ext3_sb.h
fs/ext3/file.c +2 -3
index acc4913..9d57f8e 100644
@@ -20,9 +20,8 @@
 
 #include <linux/time.h>
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 #include "acl.h"
fs/ext3/fsync.c +2 -3
index d336341..a785985 100644
@@ -26,9 +26,8 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/writeback.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 /*
  * akpm: A new design for ext3_sync_file().
fs/ext3/hash.c +1 -2
index c30e149..9433d53 100644
@@ -10,9 +10,8 @@
  */
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/cryptohash.h>
+#include "ext3.h"
 
 #define DELTA 0x9E3779B9
fs/ext3/ialloc.c +2 -3
index 7712682..34daa2b 100644
@@ -14,15 +14,14 @@
 
 #include <linux/time.h>
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/random.h>
 #include <linux/bitops.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 #include <asm/byteorder.h>
fs/ext3/inode.c +2 -2
index 6ae4ecf..beb8569 100644
@@ -25,8 +25,6 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/time.h>
-#include <linux/ext3_jbd.h>
-#include <linux/jbd.h>
 #include <linux/highuid.h>
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>

@@ -36,6 +34,8 @@
 #include <linux/mpage.h>
 #include <linux/uio.h>
 #include <linux/bio.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 #include "acl.h"
fs/ext3/ioctl.c +2 -3
index 0d0c701..0f3d04c 100644
@@ -8,15 +8,14 @@
  */
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
 #include <linux/capability.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
 #include <linux/mount.h>
 #include <linux/time.h>
 #include <linux/compat.h>
 #include <linux/smp_lock.h>
 #include <asm/uaccess.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
 		unsigned long arg)
fs/ext3/namei.c +2 -3
index 0b8cf80..2bbcc6d 100644
@@ -26,16 +26,15 @@
 
 #include <linux/fs.h>
 #include <linux/pagemap.h>
-#include <linux/jbd.h>
 #include <linux/time.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
 #include <linux/fcntl.h>
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/bio.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 #include "namei.h"
 #include "xattr.h"
fs/ext3/resize.c +2 -3
index 28cfd0b..54fb515 100644
@@ -11,11 +11,10 @@
 
 #define EXT3FS_DEBUG
 
-#include <linux/ext3_jbd.h>
-
 #include <linux/errno.h>
 #include <linux/slab.h>
-
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 #define outside(b, first, last)	((b) < (first) || (b) >= (last))
 #define inside(b, first, last)	((b) >= (first) && (b) < (last))
fs/ext3/super.c +2 -3
index fe3119a..e77bb36 100644
@@ -20,9 +20,6 @@
 #include <linux/string.h>
 #include <linux/fs.h>
 #include <linux/time.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
-#include <linux/ext3_jbd.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>

@@ -37,6 +34,8 @@
 #include <linux/quotaops.h>
 #include <linux/seq_file.h>
 #include <linux/log2.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 
 #include <asm/uaccess.h>
fs/ext3/symlink.c +1 -2
index ff7b4cc..44b6185 100644
@@ -18,9 +18,8 @@
  */
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/namei.h>
+#include "ext3.h"
 #include "xattr.h"
 
 static void * ext3_follow_link(struct dentry *dentry, struct nameidata *nd)
fs/ext3/xattr.c +2 -2
index d4a4f0e..5b2eb4a 100644
@@ -53,11 +53,11 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
 #include <linux/mbcache.h>
 #include <linux/quotaops.h>
 #include <linux/rwsem.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 #include "acl.h"
fs/ext3/xattr_security.c +2 -2
index 821efaf..afa6f4b 100644
@@ -6,8 +6,8 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include <linux/security.h>
 #include "xattr.h"
fs/ext3/xattr_trusted.c +2 -2
index 0327497..75bceb3 100644
@@ -9,8 +9,8 @@
 #include <linux/string.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 
 #define XATTR_TRUSTED_PREFIX "trusted."
fs/ext3/xattr_user.c +2 -2
index 1abd8f9..abb218b 100644
@@ -8,8 +8,8 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
-#include <linux/ext3_jbd.h>
-#include <linux/ext3_fs.h>
+#include "ext3.h"
+#include "ext3_jbd.h"
 #include "xattr.h"
 
 #define XATTR_USER_PREFIX "user."
Signature · 1 line
1.5.4.1.144.gdfee-dirty