[PATCH] fix up ext2_fs.h for userspace after reservations backport

[PATCH] fix up ext2_fs.h for userspace after reservations backport

[Eric Sandeen]

From: Tobias Poschwatta <tp@fonz.de>

In commit a686cd898bd999fd026a51e90fb0a3410d258ddb:

 "Val's cross-port of the ext3 reservations code into ext2."

include/linux/ext2_fs.h got a new function whose return value is only
defined if __KERNEL__ is defined. Putting #ifdef __KERNEL__ around the
function seems to help, patch below.

BR, Tobias

Signed-off-by: Eric Sandeen <sandeen@redhat.com>

---

Index: linux-2.6.24-rc1/include/linux/ext2_fs.h
===================================================================
--- linux-2.6.24-rc1.orig/include/linux/ext2_fs.h
+++ linux-2.6.24-rc1/include/linux/ext2_fs.h
@@ -563,11 +563,13 @@ enum {
 					 ~EXT2_DIR_ROUND)
 #define EXT2_MAX_REC_LEN		((1<<16)-1)
 
+#ifdef __KERNEL__
 static inline ext2_fsblk_t
 ext2_group_first_block_no(struct super_block *sb, unsigned long group_no)
 {
 	return group_no * (ext2_fsblk_t)EXT2_BLOCKS_PER_GROUP(sb) +
 		le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block);
 }
+#endif
 
 #endif	/* _LINUX_EXT2_FS_H */

Re: [PATCH] fix up ext2_fs.h for userspace after reservations backport

[Andrew Morton]

On Mon, 26 Nov 2007 11:19:57 -0600
Eric Sandeen <sandeen@redhat.com> wrote:

> From: Tobias Poschwatta <tp@fonz.de>
> 
> In commit a686cd898bd999fd026a51e90fb0a3410d258ddb:
> 
>  "Val's cross-port of the ext3 reservations code into ext2."
> 
> include/linux/ext2_fs.h got a new function whose return value is only
> defined if __KERNEL__ is defined. Putting #ifdef __KERNEL__ around the
> function seems to help, patch below.
> 
> BR, Tobias
> 
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> 
> ---
> 
> Index: linux-2.6.24-rc1/include/linux/ext2_fs.h
> ===================================================================
> --- linux-2.6.24-rc1.orig/include/linux/ext2_fs.h
> +++ linux-2.6.24-rc1/include/linux/ext2_fs.h
> @@ -563,11 +563,13 @@ enum {
>  					 ~EXT2_DIR_ROUND)
>  #define EXT2_MAX_REC_LEN		((1<<16)-1)
>  
> +#ifdef __KERNEL__
>  static inline ext2_fsblk_t
>  ext2_group_first_block_no(struct super_block *sb, unsigned long group_no)
>  {
>  	return group_no * (ext2_fsblk_t)EXT2_BLOCKS_PER_GROUP(sb) +
>  		le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block);
>  }
> +#endif
>  
>  #endif	/* _LINUX_EXT2_FS_H */

I did this instead:

From: Tobias Poschwatta <tp@fonz.de>

In commit a686cd898bd999fd026a51e90fb0a3410d258ddb:

 "Val's cross-port of the ext3 reservations code into ext2."

include/linux/ext2_fs.h got a new function whose return value is only
defined if __KERNEL__ is defined. Putting #ifdef __KERNEL__ around the
function seems to help, patch below.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/ext2/ext2.h          |    7 +++++++
 include/linux/ext2_fs.h |    7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff -puN include/linux/ext2_fs.h~fix-up-ext2_fsh-for-userspace-after-reservations-backport include/linux/ext2_fs.h
--- a/include/linux/ext2_fs.h~fix-up-ext2_fsh-for-userspace-after-reservations-backport
+++ a/include/linux/ext2_fs.h
@@ -563,11 +563,4 @@ enum {
 					 ~EXT2_DIR_ROUND)
 #define EXT2_MAX_REC_LEN		((1<<16)-1)
 
-static inline ext2_fsblk_t
-ext2_group_first_block_no(struct super_block *sb, unsigned long group_no)
-{
-	return group_no * (ext2_fsblk_t)EXT2_BLOCKS_PER_GROUP(sb) +
-		le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block);
-}
-
 #endif	/* _LINUX_EXT2_FS_H */
diff -puN fs/ext2/ext2.h~fix-up-ext2_fsh-for-userspace-after-reservations-backport fs/ext2/ext2.h
--- a/fs/ext2/ext2.h~fix-up-ext2_fsh-for-userspace-after-reservations-backport
+++ a/fs/ext2/ext2.h
@@ -178,3 +178,10 @@ extern const struct inode_operations ext
 /* symlink.c */
 extern const struct inode_operations ext2_fast_symlink_inode_operations;
 extern const struct inode_operations ext2_symlink_inode_operations;
+
+static inline ext2_fsblk_t
+ext2_group_first_block_no(struct super_block *sb, unsigned long group_no)
+{
+	return group_no * (ext2_fsblk_t)EXT2_BLOCKS_PER_GROUP(sb) +
+		le32_to_cpu(EXT2_SB(sb)->s_es->s_first_data_block);
+}
_

Re: [PATCH] fix up ext2_fs.h for userspace after reservations backport

[Eric Sandeen]

Andrew Morton wrote:

> I did this instead:

(moved offending function from ext2_fs.h to ext2.h)

Look like a better plan, thanks.

-Eric