Re: 2.6.9-rc2-mm2

From: Vladimir Saveliev
Date: Thu Sep 23 2004 - 08:16:54 EST


Hello

On Thu, 2004-09-23 at 00:12, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.9-rc2/2.6.9-rc2-mm2/
>

> +reiser4-plugin_set_done-memleak-fix.patch
> +reiser4-init-max_atom_flusers.patch
> +reiser4-parse-options-reduce-stack-usage.patch
> +reiser4-sparce64-warning-fix.patch
> +reiser4-x86_64-warning-fix.patch
> +reiser4-fix-mount-option-parsing.patch
> +reiser4-parse-option-cleanup.patch
> +reiser4-comment-fix.patch
> +reiser4-fill_super-improve-warning.patch
> +reiser4-disable-pseudo.patch
> +reiser4-disable-repacker.patch
>

Sorry, please replace reiser4-disable-repacker.patch with the attached
one.

> reiser4 update
>


This disables reiser4 online repacker.


fs/reiser4/repacker.c | 6 ++++++
1 files changed, 6 insertions(+)

diff -puN fs/reiser4/repacker.c~reiser4-disable-repacker fs/reiser4/repacker.c
--- linux-2.6.9-rc2-mm1/fs/reiser4/repacker.c~reiser4-disable-repacker 2004-09-18 13:07:01.852728941 +0400
+++ linux-2.6.9-rc2-mm1-vs/fs/reiser4/repacker.c 2004-09-23 14:01:45.738053471 +0400
@@ -624,6 +624,7 @@ static void done_repacker_sysfs_interfac

reiser4_internal int init_reiser4_repacker (struct super_block *super)
{
+#if defined(REISER4_REPACKER)
reiser4_super_info_data * sinfo = get_super_private(super);

assert ("zam-946", sinfo->repacker == NULL);
@@ -640,10 +641,14 @@ reiser4_internal int init_reiser4_repack
kcond_init(&sinfo->repacker->cond);

return init_repacker_sysfs_interface(super);
+#else
+ return 0;
+#endif /*REISER4_REPACKER*/
}

reiser4_internal void done_reiser4_repacker (struct super_block *super)
{
+#if defined(REISER4_REPACKER)
reiser4_super_info_data * sinfo = get_super_private(super);
struct repacker * repacker;

@@ -658,4 +663,5 @@ reiser4_internal void done_reiser4_repac

kfree(repacker);
sinfo->repacker = NULL;
+#endif /*REISER4_REPACKER*/
}

_