| Message ID | 1332494856-31943-1-git-send-email-thierry.reding@avionic-design.de |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, Mar 23, 2012 at 10:27:36AM +0100, Thierry Reding wrote: > Since the on-disk format has been stable for quite some time, users > should either use the headers provided by libext2fs or keep a private > copy of this header. For the full discussion, see this thread: > > https://lkml.org/lkml/2012/3/21/516 > > While at it, this commit removes all __KERNEL__ guards, which are now > unnecessary. > > Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> > Cc: Al Viro <viro@zeniv.linux.org.uk> > Cc: Jan Kara <jack@suse.cz> > Cc: Ted Ts'o <tytso@mit.edu> > Cc: Artem Bityutskiy <dedekind1@gmail.com> > Cc: Andreas Dilger <aedilger@gmail.com> > Cc: linux-ext4@vger.kernel.org Acked-by: "Theodore Ts'o" <tytso@mit.edu> Thanks!! Al, do you want to take this in the VFS tree, or do you want me to carry this in the ext4 tree? Or Jan could carry it in the ext2 tree. I don't really have strong feelings about who picks it up. I will if no one else wants to... - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Mar 23, 2012 at 09:13:31AM -0400, Ted Ts'o wrote: > On Fri, Mar 23, 2012 at 10:27:36AM +0100, Thierry Reding wrote: > > Since the on-disk format has been stable for quite some time, users > > should either use the headers provided by libext2fs or keep a private > > copy of this header. For the full discussion, see this thread: > > > > https://lkml.org/lkml/2012/3/21/516 > > > > While at it, this commit removes all __KERNEL__ guards, which are now > > unnecessary. > > > > Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> > > Cc: Al Viro <viro@zeniv.linux.org.uk> > > Cc: Jan Kara <jack@suse.cz> > > Cc: Ted Ts'o <tytso@mit.edu> > > Cc: Artem Bityutskiy <dedekind1@gmail.com> > > Cc: Andreas Dilger <aedilger@gmail.com> > > Cc: linux-ext4@vger.kernel.org > > Acked-by: "Theodore Ts'o" <tytso@mit.edu> > > Thanks!! > > Al, do you want to take this in the VFS tree, or do you want me to > carry this in the ext4 tree? Or Jan could carry it in the ext2 tree. > I don't really have strong feelings about who picks it up. I will if > no one else wants to... Applied. I'll probably add a followup moving most of that stuff to fs/ext2/ext2.h on top of that commit... -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Peter, Note that we are planning on unexporting ext2_fs.h, and then utterly removing it from the tree (with what fs/ext2 needs being moved to fs/ext2/ext2.h). Someone who was compiling "the latest version" of syslinux has submitted a kernel bugzilla entry that this was breaking due to ext2_fs.h using umode_t which was no longer being exported by the kernel header files. Given that ext2_fs.h is about to go ***poof*** (Al already has the changes in his vfs git tree), I thought I should give you a heads up.... - Ted On Fri, Mar 23, 2012 at 05:55:34PM +0000, Al Viro wrote: > On Fri, Mar 23, 2012 at 09:13:31AM -0400, Ted Ts'o wrote: > > On Fri, Mar 23, 2012 at 10:27:36AM +0100, Thierry Reding wrote: > > > Since the on-disk format has been stable for quite some time, users > > > should either use the headers provided by libext2fs or keep a private > > > copy of this header. For the full discussion, see this thread: > > > > > > https://lkml.org/lkml/2012/3/21/516 > > > > > > While at it, this commit removes all __KERNEL__ guards, which are now > > > unnecessary. > > > > > > Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> > > > Cc: Al Viro <viro@zeniv.linux.org.uk> > > > Cc: Jan Kara <jack@suse.cz> > > > Cc: Ted Ts'o <tytso@mit.edu> > > > Cc: Artem Bityutskiy <dedekind1@gmail.com> > > > Cc: Andreas Dilger <aedilger@gmail.com> > > > Cc: linux-ext4@vger.kernel.org > > > > Acked-by: "Theodore Ts'o" <tytso@mit.edu> > > > > Thanks!! > > > > Al, do you want to take this in the VFS tree, or do you want me to > > carry this in the ext4 tree? Or Jan could carry it in the ext2 tree. > > I don't really have strong feelings about who picks it up. I will if > > no one else wants to... > > Applied. I'll probably add a followup moving most of that stuff to > fs/ext2/ext2.h on top of that commit... > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 03/24/2012 02:51 PM, Ted Ts'o wrote: > Peter, > > Note that we are planning on unexporting ext2_fs.h, and then utterly > removing it from the tree (with what fs/ext2 needs being moved to > fs/ext2/ext2.h). > > Someone who was compiling "the latest version" of syslinux has > submitted a kernel bugzilla entry that this was breaking due to > ext2_fs.h using umode_t which was no longer being exported by the > kernel header files. Given that ext2_fs.h is about to go ***poof*** > (Al already has the changes in his vfs git tree), I thought I should > give you a heads up.... > Thanks. Syslinux already includes a private copy of ext2_fs.h, but I need to scrub the umode_t inclusion. -hpa
On Sat, Mar 24, 2012 at 03:16:37PM -0700, H. Peter Anvin wrote: > > Someone who was compiling "the latest version" of syslinux has > > submitted a kernel bugzilla entry that this was breaking due to > > ext2_fs.h using umode_t which was no longer being exported by the > > kernel header files. Given that ext2_fs.h is about to go ***poof*** > > (Al already has the changes in his vfs git tree), I thought I should > > give you a heads up.... > > > > Thanks. Syslinux already includes a private copy of ext2_fs.h, but I > need to scrub the umode_t inclusion. Ah, good. I'll close the kernel bugzilla report in that case. Thanks, - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index a255553..1cb0704 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -120,7 +120,6 @@ header-y += errno.h header-y += errqueue.h header-y += ethtool.h header-y += eventpoll.h -header-y += ext2_fs.h header-y += fadvise.h header-y += falloc.h header-y += fanotify.h diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h index ce1b719..f28dba5 100644 --- a/include/linux/ext2_fs.h +++ b/include/linux/ext2_fs.h @@ -20,6 +20,8 @@ #include <linux/magic.h> #include <linux/fs.h> +#include <linux/ext2_fs_sb.h> + /* * The second extended filesystem constants/structures */ @@ -66,18 +68,10 @@ /* First non-reserved inode for old ext2 filesystems */ #define EXT2_GOOD_OLD_FIRST_INO 11 -#ifdef __KERNEL__ -#include <linux/ext2_fs_sb.h> static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb) { return sb->s_fs_info; } -#else -/* Assume that user mode programs are passing in an ext2fs superblock, not - * a kernel struct super_block. This will allow us to call the feature-test - * macros from user land. */ -#define EXT2_SB(sb) (sb) -#endif /* * Maximal count of links to a file @@ -90,29 +84,12 @@ static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb) #define EXT2_MIN_BLOCK_SIZE 1024 #define EXT2_MAX_BLOCK_SIZE 4096 #define EXT2_MIN_BLOCK_LOG_SIZE 10 -#ifdef __KERNEL__ -# define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize) -#else -# define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size) -#endif +#define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize) #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) -#ifdef __KERNEL__ -# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits) -#else -# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) -#endif -#ifdef __KERNEL__ +#define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits) #define EXT2_ADDR_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_addr_per_block_bits) #define EXT2_INODE_SIZE(s) (EXT2_SB(s)->s_inode_size) #define EXT2_FIRST_INO(s) (EXT2_SB(s)->s_first_ino) -#else -#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ - EXT2_GOOD_OLD_INODE_SIZE : \ - (s)->s_inode_size) -#define EXT2_FIRST_INO(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ - EXT2_GOOD_OLD_FIRST_INO : \ - (s)->s_first_ino) -#endif /* * Macro-instructions used to manage fragments @@ -120,13 +97,8 @@ static inline struct ext2_sb_info *EXT2_SB(struct super_block *sb) #define EXT2_MIN_FRAG_SIZE 1024 #define EXT2_MAX_FRAG_SIZE 4096 #define EXT2_MIN_FRAG_LOG_SIZE 10 -#ifdef __KERNEL__ -# define EXT2_FRAG_SIZE(s) (EXT2_SB(s)->s_frag_size) -# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_SB(s)->s_frags_per_block) -#else -# define EXT2_FRAG_SIZE(s) (EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size) -# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s)) -#endif +#define EXT2_FRAG_SIZE(s) (EXT2_SB(s)->s_frag_size) +#define EXT2_FRAGS_PER_BLOCK(s) (EXT2_SB(s)->s_frags_per_block) /* * Structure of a blocks group descriptor @@ -146,16 +118,10 @@ struct ext2_group_desc /* * Macro-instructions used to manage group descriptors */ -#ifdef __KERNEL__ -# define EXT2_BLOCKS_PER_GROUP(s) (EXT2_SB(s)->s_blocks_per_group) -# define EXT2_DESC_PER_BLOCK(s) (EXT2_SB(s)->s_desc_per_block) -# define EXT2_INODES_PER_GROUP(s) (EXT2_SB(s)->s_inodes_per_group) -# define EXT2_DESC_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_desc_per_block_bits) -#else -# define EXT2_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group) -# define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc)) -# define EXT2_INODES_PER_GROUP(s) ((s)->s_inodes_per_group) -#endif +#define EXT2_BLOCKS_PER_GROUP(s) (EXT2_SB(s)->s_blocks_per_group) +#define EXT2_DESC_PER_BLOCK(s) (EXT2_SB(s)->s_desc_per_block) +#define EXT2_INODES_PER_GROUP(s) (EXT2_SB(s)->s_inodes_per_group) +#define EXT2_DESC_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_desc_per_block_bits) /* * Constants relative to the data blocks @@ -296,7 +262,6 @@ struct ext2_inode { #define i_size_high i_dir_acl -#if defined(__KERNEL__) || defined(__linux__) #define i_reserved1 osd1.linux1.l_i_reserved1 #define i_frag osd2.linux2.l_i_frag #define i_fsize osd2.linux2.l_i_fsize @@ -305,23 +270,6 @@ struct ext2_inode { #define i_uid_high osd2.linux2.l_i_uid_high #define i_gid_high osd2.linux2.l_i_gid_high #define i_reserved2 osd2.linux2.l_i_reserved2 -#endif - -#ifdef __hurd__ -#define i_translator osd1.hurd1.h_i_translator -#define i_frag osd2.hurd2.h_i_frag -#define i_fsize osd2.hurd2.h_i_fsize -#define i_uid_high osd2.hurd2.h_i_uid_high -#define i_gid_high osd2.hurd2.h_i_gid_high -#define i_author osd2.hurd2.h_i_author -#endif - -#ifdef __masix__ -#define i_reserved1 osd1.masix1.m_i_reserved1 -#define i_frag osd2.masix2.m_i_frag -#define i_fsize osd2.masix2.m_i_fsize -#define i_reserved2 osd2.masix2.m_i_reserved2 -#endif /* * File system states
Since the on-disk format has been stable for quite some time, users should either use the headers provided by libext2fs or keep a private copy of this header. For the full discussion, see this thread: https://lkml.org/lkml/2012/3/21/516 While at it, this commit removes all __KERNEL__ guards, which are now unnecessary. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Jan Kara <jack@suse.cz> Cc: Ted Ts'o <tytso@mit.edu> Cc: Artem Bityutskiy <dedekind1@gmail.com> Cc: Andreas Dilger <aedilger@gmail.com> Cc: linux-ext4@vger.kernel.org --- include/linux/Kbuild | 1 - include/linux/ext2_fs.h | 72 +++++++---------------------------------------- 2 files changed, 10 insertions(+), 63 deletions(-)