2008-06-11 08:45:05

by Li Zefan

Subject: [PATCH] ext4: fix build failure if DX_DEBUG

I got build failure when I turned on DX_DEBUG.

fs/ext4/namei.c: In function ‘dx_show_leaf’:
fs/ext4/namei.c:291: error: implicit declaration of function ‘ext4_next_entry’
fs/ext4/namei.c:291: warning: assignment makes pointer from integer without a cast

Move the definition of ext4_next_entry() upwards just as ext3 code.

Signed-off-by: Li Zefan <[email protected]>
---
fs/ext4/namei.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index ab16bea..4315fd7 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -183,6 +183,16 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry,
struct inode *inode);

/*
+ * p is at least 6 bytes before the end of page
+ */
+static inline struct ext4_dir_entry_2 *
+ext4_next_entry(struct ext4_dir_entry_2 *p)
+{
+ return (struct ext4_dir_entry_2 *)((char *)p +
+ ext4_rec_len_from_disk(p->rec_len));
+}
+
+/*
* Future: use high four bits of block for coalesce-on-delete flags
* Mask them off for now.
*/
@@ -554,15 +564,6 @@ static int ext4_htree_next_block(struct inode *dir, __u32 hash,


/*
- * p is at least 6 bytes before the end of page
- */
-static inline struct ext4_dir_entry_2 *ext4_next_entry(struct ext4_dir_entry_2 *p)
-{
- return (struct ext4_dir_entry_2 *)((char *)p +
- ext4_rec_len_from_disk(p->rec_len));
-}

2008-06-11 16:10:09

by Eric Sandeen

Subject: Re: [PATCH] ext4: fix build failure if DX_DEBUG

Li Zefan wrote:
> I got build failure when I turned on DX_DEBUG.
>
> fs/ext4/namei.c: In function ‘dx_show_leaf’:
> fs/ext4/namei.c:291: error: implicit declaration of function ‘ext4_next_entry’
> fs/ext4/namei.c:291: warning: assignment makes pointer from integer without a cast
>
> Move the definition of ext4_next_entry() upwards just as ext3 code.
>
> Signed-off-by: Li Zefan <[email protected]>

Thanks, I added this to the bugfix portion of the ext4 patch queue.

-Eric

> ---
> fs/ext4/namei.c | 19 ++++++++++---------
> 1 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> index ab16bea..4315fd7 100644
> --- a/fs/ext4/namei.c
> +++ b/fs/ext4/namei.c
> @@ -183,6 +183,16 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry,
> struct inode *inode);
>
> /*
> + * p is at least 6 bytes before the end of page
> + */
> +static inline struct ext4_dir_entry_2 *
> +ext4_next_entry(struct ext4_dir_entry_2 *p)
> +{
> + return (struct ext4_dir_entry_2 *)((char *)p +
> + ext4_rec_len_from_disk(p->rec_len));
> +}
> +
> +/*
> * Future: use high four bits of block for coalesce-on-delete flags
> * Mask them off for now.
> */
> @@ -554,15 +564,6 @@ static int ext4_htree_next_block(struct inode *dir, __u32 hash,
>
>
> /*
> - * p is at least 6 bytes before the end of page
> - */
> -static inline struct ext4_dir_entry_2 *ext4_next_entry(struct ext4_dir_entry_2 *p)
> -{
> - return (struct ext4_dir_entry_2 *)((char *)p +
> - ext4_rec_len_from_disk(p->rec_len));
> -}
> -
> -/*
> * This function fills a red-black tree with information from a
> * directory block. It returns the number directory entries loaded
> * into the tree. If there is an error it is returned in err.

2008-07-06 04:08:16

by Theodore Ts'o

Subject: Re: [PATCH] ext4: fix build failure if DX_DEBUG

On Wed, Jun 11, 2008 at 11:03:39AM -0500, Eric Sandeen wrote:
> Li Zefan wrote:
> > I got build failure when I turned on DX_DEBUG.
> >
> > fs/ext4/namei.c: In function ‘dx_show_leaf’:
> > fs/ext4/namei.c:291: error: implicit declaration of function ‘ext4_next_entry’
> > fs/ext4/namei.c:291: warning: assignment makes pointer from integer without a cast
> >
> > Move the definition of ext4_next_entry() upwards just as ext3 code.
> >
> > Signed-off-by: Li Zefan <[email protected]>
>
> Thanks, I added this to the bugfix portion of the ext4 patch queue.

But you forgot to edit the series file. :-)

I've fixed in the patch queue, and it will be in the 2.6.26-rc9-ext4-1
patch drop.

- Ted

2008-07-06 04:10:18

by Eric Sandeen

Subject: Re: [PATCH] ext4: fix build failure if DX_DEBUG

Theodore Tso wrote:
> On Wed, Jun 11, 2008 at 11:03:39AM -0500, Eric Sandeen wrote:
>> Li Zefan wrote:
>>> I got build failure when I turned on DX_DEBUG.
>>>
>>> fs/ext4/namei.c: In function ‘dx_show_leaf’:
>>> fs/ext4/namei.c:291: error: implicit declaration of function ‘ext4_next_entry’
>>> fs/ext4/namei.c:291: warning: assignment makes pointer from integer without a cast
>>>
>>> Move the definition of ext4_next_entry() upwards just as ext3 code.
>>>
>>> Signed-off-by: Li Zefan <[email protected]>
>> Thanks, I added this to the bugfix portion of the ext4 patch queue.
>
> But you forgot to edit the series file. :-)
>
> I've fixed in the patch queue, and it will be in the 2.6.26-rc9-ext4-1
> patch drop.

*sigh*

Thanks...

-Eric