2008-08-04 17:42:17

by Aneesh Kumar K.V

[permalink] [raw]
Subject: Build error with patchqueue

Hi Ted,

The patchqueue have the below build error.

CC fs/ext4/inode.o
fs/ext4/inode.c: In function ‘ext4_delete_inode’:
fs/ext4/inode.c:230: error: implicit declaration of function
‘ext4_ext_journal_restart’
make[1]: *** [fs/ext4/inode.o] Error 1
make: *** [fs/ext4/] Error 2
kvaneesh@skywalker:/home/opensource/patches/work-tree/linux-review-ext-build$make
fs/ext4/

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 68f148c..70829d5 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -92,7 +92,7 @@ static void ext4_idx_store_pblock(struct ext4_extent_idx *ix, ext4_fsblk_t pb)
ix->ei_leaf_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);
}

-static int ext4_ext_journal_restart(handle_t *handle, int needed)
+int ext4_ext_journal_restart(handle_t *handle, int needed)
{
int err;

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index fe1570d..77ef18b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -190,6 +190,7 @@ static int ext4_journal_test_restart(handle_t *handle, struct inode *inode)
/*
* Called at the last iput() if i_nlink is zero.
*/
+int ext4_ext_journal_restart(handle_t *handle, int needed);
void ext4_delete_inode (struct inode * inode)
{
handle_t *handle;
@@ -228,7 +229,7 @@ void ext4_delete_inode (struct inode * inode)
* the orphan list and set the dtime field.
*/
if (ext4_ext_journal_restart(handle, 3)) {
- stop_handle:
+stop_handle:
ext4_journal_stop(handle);
goto no_delete;
}


2008-08-04 17:53:54

by Theodore Ts'o

[permalink] [raw]
Subject: Re: Build error with patchqueue

On Mon, Aug 04, 2008 at 11:12:09PM +0530, Aneesh Kumar K.V wrote:
>
> The patchqueue have the below build error.

Sorry about that! I forgot to push out the fix to that. I've just
updated the patch queue with the fix-ups to the patches before I
pushed to Linus and released 2.6.26-rc1-ext4-1/2.6.26-ext4-5.


- Ted