diff options
author | jhb <jhb@FreeBSD.org> | 2011-02-04 14:20:27 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2011-02-04 14:20:27 +0000 |
commit | 56b54d13f219ed2a8f518c0a57b84ff5e9361daf (patch) | |
tree | c32c0411c88ccf83303eb56358d327b82672b002 /sys | |
parent | 853e3285412a4f4ec7478a6cff3d9b8ba77e0ec6 (diff) | |
download | FreeBSD-src-56b54d13f219ed2a8f518c0a57b84ff5e9361daf.zip FreeBSD-src-56b54d13f219ed2a8f518c0a57b84ff5e9361daf.tar.gz |
Collapse duplicate definitions of EXT2_SB().
Submitted by: Pedro F. Giffuni giffunip at yahoo
Diffstat (limited to 'sys')
-rwxr-xr-x | sys/fs/ext2fs/ext2fs.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/sys/fs/ext2fs/ext2fs.h b/sys/fs/ext2fs/ext2fs.h index b546cac..b2f2f29 100755 --- a/sys/fs/ext2fs/ext2fs.h +++ b/sys/fs/ext2fs/ext2fs.h @@ -39,19 +39,6 @@ #include <sys/types.h> -#if defined(_KERNEL) -/* - * FreeBSD passes the pointer to the in-core struct with relevant - * fields to EXT2_SB macro when accessing superblock fields. - */ -#define EXT2_SB(sb) (sb) -#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 */ @@ -118,10 +105,6 @@ struct ext2fs { u_int32_t reserved2[204]; }; -/* 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) /* * In-Memory Superblock @@ -208,6 +191,11 @@ struct m_ext2fs { | EXT2F_ROCOMPAT_LARGEFILE) #define EXT2F_INCOMPAT_SUPP EXT2F_INCOMPAT_FTYPE +/* 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) + /* * Feature set definitions */ @@ -260,6 +248,7 @@ struct ext2_gd { #define e2fs_cgload(old, new, size) memcpy((new), (old), (size)); #define e2fs_cgsave(old, new, size) memcpy((new), (old), (size)); + /* * Macro-instructions used to manage several block sizes */ |