Hello community, here is the log from the commit of package aufs checked in at Tue Jun 5 21:22:52 CEST 2007. -------- --- aufs/aufs.changes 2007-05-09 16:02:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/aufs/aufs.changes 2007-06-05 21:04:31.877012000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 5 19:04:12 CEST 2007 - jeffm@suse.com + +- Patch to work with 2.6.22 + +------------------------------------------------------------------- Old: ---- aufs-cvs20070509.tar.bz2 New: ---- aufs-cvs20070604.tar.bz2 aufs-si_flags-rename.diff aufs-stack-protect-stub.diff preamble ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aufs.spec ++++++ --- /var/tmp/diff_new_pack.y17025/_old 2007-06-05 21:21:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y17025/_new 2007-06-05 21:21:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package aufs (Version cvs20070509) +# spec file for package aufs (Version cvs20070604) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,33 +15,35 @@ BuildRequires: %kernel_module_package_buildreq e2fsprogs-devel kernel-source kernel-syms module-init-tools License: GNU General Public License (GPL) Group: System/Filesystems -Version: cvs20070509 +Version: cvs20070604 Release: 1 Source0: aufs-%{version}.tar.bz2 +Source100: preamble Patch0: aa-hack Patch1: local.mk-fix -URL: http://www.unionfs.org/ +Patch2: aufs-stack-protect-stub.diff +Patch3: aufs-si_flags-rename.diff +URL: http://aufs.sf.net BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Utilities to Manipulate unionfs Components -%suse_kernel_module_package kdump um +Summary: Utilities to Manipulate aufs Components +%suse_kernel_module_package -n %{name} -p %_sourcedir/preamble kdump um %description These are command line tools to inspect and manipulate the components -merged by unionfs in user space. +merged by aufs in user space. Authors: -------- - Erez Zadok - Charles P. Wrigh + Junjiro Okajima %package KMP Group: System/Filesystems Summary: kernel modules required to merge directories into a transparent union file system %description KMP -Unionfs is a stackable unification file system, which can merge the +Aufs is a stackable unification file system, which can merge the contents of several directories (so called branches) while keeping their physical content separate. It allows any mix of read-only and read-write branches, as well as insertion and deletion of branches on @@ -51,13 +53,14 @@ Authors: -------- - Erez Zadok - Charles P. Wrigh + Junjiro Okajima %prep %setup -n aufs %patch -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build export EXTRA_CFLAGS="$RPM_OPT_FLAGS" @@ -66,8 +69,9 @@ rm -rf obj/$flavor cp -r fs/aufs obj/$flavor # export KFLAVOR=$flavor - export KBUILD_EXTMOD=`pwd`/obj/$flavor - make -f local.mk -k KDIR=/usr/src/linux-obj/%_target_cpu/$flavor +# export KBUILD_EXTMOD=`pwd`/obj/$flavor + make -f local.mk KDIR=/usr/src/linux-obj/%_target_cpu/$flavor \ + M=$PWD/obj/$flavor done %install @@ -75,13 +79,13 @@ export INSTALL_MOD_PATH=$RPM_BUILD_ROOT export INSTALL_MOD_DIR=kernel/fs for flavor in %flavors_to_build; do - make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \ - M=$PWD/obj/$flavor V=1 + make -C /usr/src/linux-obj/%_target_cpu/$flavor M=$PWD/obj/$flavor \ + V=1 modules_install done mkdir -p $RPM_BUILD_ROOT/usr/share/man/man5 mkdir -p $RPM_BUILD_ROOT/sbin cp -p util/aufs.5 $RPM_BUILD_ROOT/usr/share/man/man5/. -cp -p util/*.aufs util/unionctl util/au{find.sh,lchown,plink} \ +cp -p util/*.aufs sample/unionctl util/au{find.sh,lchown,plink} \ $RPM_BUILD_ROOT/sbin/. %clean @@ -94,6 +98,8 @@ /usr/share/man/man?/* %changelog +* Tue Jun 05 2007 - jeffm@suse.com +- Patch to work with 2.6.22 * Wed May 09 2007 - duwe@suse.de - hack the "vfs_*" interface to match the AppArmor API change - fix "local.mk" to work with multiple kernel flavours ++++++ aa-hack ++++++ --- /var/tmp/diff_new_pack.y17025/_old 2007-06-05 21:21:39.000000000 +0200 +++ /var/tmp/diff_new_pack.y17025/_new 2007-06-05 21:21:39.000000000 +0200 @@ -54,6 +54,18 @@ #endif lockdep_on(); return err; +@@ -177,11 +177,7 @@ + LKTRTrace("i%lu, %.*s\n", dir->i_ino, DLNPair(dentry)); + + lockdep_off(); +-#if 0//def CONFIG_VSERVER + err = vfs_unlink(dir, dentry, NULL); +-#else +- err = vfs_unlink(dir, dentry); +-#endif + lockdep_on(); + return err; + } --- aufs/fs/aufs/vfsub.c.orig 2007-04-23 02:55:06.000000000 +0200 +++ aufs/fs/aufs/vfsub.c 2007-05-03 17:26:24.000000000 +0200 @@ -527,7 +527,7 @@ static void call_notify_change(void *arg @@ -65,12 +77,4 @@ lockdep_on(); } TraceErr(*a->errp); -@@ -594,7 +594,7 @@ static void call_unlink(void *args) - #else - // vfs_unlink() locks inode - lockdep_off(); -- *a->errp = vfs_unlink(a->dir, a->dentry); -+ *a->errp = vfs_unlink(a->dir, a->dentry, 0); - lockdep_on(); - #endif - + ++++++ aufs-cvs20070509.tar.bz2 -> aufs-cvs20070604.tar.bz2 ++++++ ++++ 8289 lines of diff (skipped) ++++++ aufs-si_flags-rename.diff ++++++ From: Jeff Mahoney <jeffm@suse.com> Subject: [PATCH] aufs: rename si_flags si_flags is used as a #define in the signal handling code of ia64. The conflict caused build failures as it was expanding si_flags into _sifields._sigfault._flags This patch renames it to avoid the conflict. Signed-off-by: Jeff Mahoney <jeffm@suse.com> --- fs/aufs/module.c | 2 +- fs/aufs/super.c | 2 +- fs/aufs/super.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff -rup aufs/fs/aufs/module.c aufs.devel/fs/aufs/module.c --- aufs/fs/aufs/module.c 2007-06-04 04:17:35.000000000 +0200 +++ aufs.devel/fs/aufs/module.c 2007-06-05 21:05:50.656153000 +0200 @@ -181,7 +181,7 @@ static int __init aufs_init(void) offsetof(typeof(*u.si), si_bend), offsetof(typeof(*u.si), si_last_br_id), offsetof(typeof(*u.si), si_branch), - offsetof(typeof(*u.si), si_flags), + offsetof(typeof(*u.si), si_sflags), offsetof(typeof(*u.si), si_xino), offsetof(typeof(*u.si), si_rdcache), offsetof(typeof(*u.si), si_dirwh), diff -rup aufs/fs/aufs/super.c aufs.devel/fs/aufs/super.c --- aufs/fs/aufs/super.c 2007-06-04 04:17:35.000000000 +0200 +++ aufs.devel/fs/aufs/super.c 2007-06-05 21:05:30.904929000 +0200 @@ -586,7 +586,7 @@ static int alloc_sbinfo(struct super_blo sbinfo->si_failed_refresh_dirs = 0; sbinfo->si_bend = -1; sbinfo->si_last_br_id = 0; - sbinfo->si_flags = AuDefFlags; + sbinfo->si_sflags = AuDefFlags; atomic_long_set(&sbinfo->si_xino, AUFS_FIRST_INO); #if 0 sbinfo->si_wkq = create_workqueue(AUFS_WKQ_NAME); diff -rup aufs/fs/aufs/super.h aufs.devel/fs/aufs/super.h --- aufs/fs/aufs/super.h 2007-06-04 04:17:35.000000000 +0200 +++ aufs.devel/fs/aufs/super.h 2007-06-05 21:05:43.035780000 +0200 @@ -61,7 +61,7 @@ struct aufs_sbinfo { struct aufs_branch **si_branch; /* mount flags */ - unsigned int si_flags; + unsigned int si_sflags; /* external inode number table */ atomic_long_t si_xino; // time bomb @@ -299,20 +299,20 @@ static inline void au_mntput(struct supe static inline void au_flag_set(struct super_block *sb, unsigned int flag) { //SiMustWriteLock(sb); - stosi(sb)->si_flags |= flag; + stosi(sb)->si_sflags |= flag; } static inline void au_flag_clr(struct super_block *sb, unsigned int flag) { //SiMustWriteLock(sb); - stosi(sb)->si_flags &= ~flag; + stosi(sb)->si_sflags &= ~flag; } static inline unsigned int au_flag_test(struct super_block *sb, unsigned int flag) { //SiMustAnyLock(sb); - return stosi(sb)->si_flags & flag; + return stosi(sb)->si_sflags & flag; } static inline unsigned int au_flag_test_udba(struct super_block *sb) ++++++ aufs-stack-protect-stub.diff ++++++ diff -rup a/fs/aufs/sysaufs.c b/fs/aufs/sysaufs.c --- a/fs/aufs/sysaufs.c 2007-06-04 04:15:32.000000000 +0200 +++ b/fs/aufs/sysaufs.c 2007-06-05 17:21:45.923161000 +0200 @@ -620,3 +620,8 @@ int is_branch(struct super_block *h_sb) return found; } #endif + +#ifndef CONFIG_CC_STACKPROTECTOR +void __stack_chk_fail(void) +{} +#endif ++++++ local.mk-fix ++++++ --- /var/tmp/diff_new_pack.y17025/_old 2007-06-05 21:21:40.000000000 +0200 +++ /var/tmp/diff_new_pack.y17025/_new 2007-06-05 21:21:40.000000000 +0200 @@ -5,7 +5,7 @@ fs/aufs/aufs.ko: FORCE # @echo ${AUFS_DEF_CONFIG} - ${MAKE} -C ${KDIR} M=${CURDIR}/fs/aufs modules -+ ${MAKE} -C ${KDIR} modules ++ ${MAKE} -C ${KDIR} M=${M} modules fs/aufs/Kconfig: Kconfig.in @cpp -undef -nostdinc -P -I${KDIR}/include $< | \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org