Hello community,
here is the log from the commit of package aufs
checked in at Wed Apr 30 11:50:22 CEST 2008.
--------
--- aufs/aufs.changes 2008-04-16 22:24:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/aufs/aufs.changes 2008-04-30 07:26:40.635420000 +0200
@@ -1,0 +2,5 @@
+Tue Apr 29 22:19:41 CEST 2008 - jeffm@suse.com
+
+- update to CVS 2008-04-29, new 2.6.25 API
+
+-------------------------------------------------------------------
Old:
----
aufs-2.6.25-api.diff
aufs-cvs20080324.tar.bz2
New:
----
aufs-cvs20080429.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aufs.spec ++++++
--- /var/tmp/diff_new_pack.bO2928/_old 2008-04-30 11:49:48.000000000 +0200
+++ /var/tmp/diff_new_pack.bO2928/_new 2008-04-30 11:49:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package aufs (Version cvs20080324)
+# spec file for package aufs (Version cvs20080429)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,16 +17,14 @@
BuildRequires: e2fsprogs-devel kernel-source kernel-syms module-init-tools
License: GPL v2 or later
Group: System/Filesystems
-Version: cvs20080324
-Release: 11
+Version: cvs20080429
+Release: 1
Source0: aufs-%{version}.tar.bz2
Source100: preamble
Patch0: aa-hack
Patch1: local.mk-fix
Patch2: aufs-stack-protect-stub.diff
-Patch3: aufs-2.6.25-api.diff
-Patch4: aufs-fsetattr
-# Patch3: aufs-cvs20071112.dif
+Patch3: aufs-fsetattr
Url: http://aufs.sf.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Utilities to Manipulate aufs Components
@@ -66,14 +64,13 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
mkdir -p obj || true
for flavor in %flavors_to_build; do
rm -rf obj/$flavor
- cp -r fs/aufs obj/$flavor
+ cp -r fs/aufs25 obj/$flavor
# export KFLAVOR=$flavor
# export KBUILD_EXTMOD=`pwd`/obj/$flavor
make -f local.mk KDIR=/usr/src/linux-obj/%_target_cpu/$flavor \
@@ -105,6 +102,8 @@
/usr/share/man/man?/*
%changelog
+* Wed Apr 30 2008 jeffm@suse.com
+- update to CVS 2008-04-29, new 2.6.25 API
* Thu Apr 17 2008 jeffm@suse.com
- Added fix for ia_file/fsetattr changes
* Fri Mar 28 2008 jeffm@suse.com
++++++ aa-hack ++++++
--- /var/tmp/diff_new_pack.bO2928/_old 2008-04-30 11:49:48.000000000 +0200
+++ /var/tmp/diff_new_pack.bO2928/_new 2008-04-30 11:49:48.000000000 +0200
@@ -1,62 +1,61 @@
---- aufs/fs/aufs/vfsub.c
-+++ aufs/fs/aufs/vfsub.c
-@@ -779,7 +779,7 @@
- if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) {
- vfsub_ignore(a->vargs);
- lockdep_off();
-- *a->errp = notify_change(a->h_dentry, a->ia);
-+ *a->errp = notify_change(a->h_dentry, 0, a->ia);
- lockdep_on();
- if (!*a->errp)
- au_update_fuse_h_inode(NULL, a->h_dentry); /*ignore*/
---- aufs/fs/aufs/vfsub.c
-+++ aufs/fs/aufs/vfsub.c
-@@ -345,7 +345,7 @@
+From: Jeff Mahoney
+Subject: aufs: AppArmor compatibility
+
+ This patch adds NULL vfsmounts for AppArmor enabled kernels.
+
+Signed-off-by: Jeff Mahoney
+---
+ fs/aufs25/vfsub.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/fs/aufs25/vfsub.c
++++ b/fs/aufs25/vfsub.c
+@@ -57,7 +57,7 @@ int do_vfsub_symlink(struct inode *dir,
dir->i_ino, AuDLNPair(dentry), symname, mode);
IMustLock(dir);
- err = vfs_symlink(dir, dentry, symname, mode);
-+ err = vfs_symlink(dir, dentry, 0, symname, mode);
++ err = vfs_symlink(dir, dentry, NULL, symname, mode);
if (!err) {
/* dir inode is locked */
au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
-@@ -363,7 +363,7 @@
+@@ -74,7 +74,7 @@ int do_vfsub_mknod(struct inode *dir, st
LKTRTrace("i%lu, %.*s, 0x%x\n", dir->i_ino, AuDLNPair(dentry), mode);
IMustLock(dir);
- err = vfs_mknod(dir, dentry, mode, dev);
-+ err = vfs_mknod(dir, dentry, 0, mode, dev);
++ err = vfs_mknod(dir, dentry, NULL, mode, dev);
if (!err) {
/* dir inode is locked */
au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
-@@ -383,7 +383,7 @@
+@@ -93,7 +93,7 @@ int do_vfsub_link(struct dentry *src_den
IMustLock(dir);
lockdep_off();
- err = vfs_link(src_dentry, dir, dentry);
-+ err = vfs_link(src_dentry, 0, dir, dentry, 0);
++ err = vfs_link(src_dentry, NULL, dir, dentry, 0);
lockdep_on();
if (!err) {
LKTRTrace("src_i %p, dst_i %p\n",
-@@ -410,7 +410,7 @@
+@@ -119,7 +119,7 @@ int do_vfsub_rename(struct inode *src_di
IMustLock(src_dir);
lockdep_off();
- err = vfs_rename(src_dir, src_dentry, dir, dentry);
-+ err = vfs_rename(src_dir, src_dentry, 0, dir, dentry, 0);
++ err = vfs_rename(src_dir, src_dentry, NULL, dir, dentry, 0);
lockdep_on();
if (!err) {
/* dir inode is locked */
-@@ -429,7 +429,7 @@
+@@ -137,7 +137,7 @@ int do_vfsub_mkdir(struct inode *dir, st
LKTRTrace("i%lu, %.*s, 0x%x\n", dir->i_ino, AuDLNPair(dentry), mode);
IMustLock(dir);
- err = vfs_mkdir(dir, dentry, mode);
-+ err = vfs_mkdir(dir, dentry, 0, mode);
++ err = vfs_mkdir(dir, dentry, NULL, mode);
if (!err) {
/* dir inode is locked */
au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
-@@ -446,7 +446,7 @@
+@@ -154,7 +154,7 @@ int do_vfsub_rmdir(struct inode *dir, st
IMustLock(dir);
lockdep_off();
@@ -65,7 +64,7 @@
lockdep_on();
/* dir inode is locked */
if (!err)
-@@ -463,7 +463,7 @@
+@@ -171,7 +171,7 @@ int do_vfsub_unlink(struct inode *dir, s
/* vfs_unlink() locks inode */
lockdep_off();
@@ -74,3 +73,12 @@
lockdep_on();
/* dir inode is locked */
if (!err)
+@@ -402,7 +402,7 @@ static void call_notify_change(void *arg
+ if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) {
+ vfsub_ignore(a->vargs);
+ lockdep_off();
+- *a->errp = notify_change(a->h_dentry, a->ia);
++ *a->errp = notify_change(a->h_dentry, NULL, a->ia);
+ lockdep_on();
+ if (!*a->errp)
+ au_update_fuse_h_inode(NULL, a->h_dentry); /*ignore*/
++++++ aufs-cvs20080324.tar.bz2 -> aufs-cvs20080429.tar.bz2 ++++++
++++ 58147 lines of diff (skipped)
++++++ aufs-fsetattr ++++++
--- /var/tmp/diff_new_pack.bO2928/_old 2008-04-30 11:49:51.000000000 +0200
+++ /var/tmp/diff_new_pack.bO2928/_new 2008-04-30 11:49:51.000000000 +0200
@@ -8,34 +8,34 @@
Signed-off-by: Jeff Mahoney
---
- fs/aufs/dir.c | 1 +
- fs/aufs/f_op.c | 1 +
- fs/aufs/i_op.c | 26 ++++++++++++++------------
- fs/aufs/inode.h | 1 +
- fs/aufs/misc.c | 5 ++---
- fs/aufs/vfsub.c | 13 ++++++++++---
- fs/aufs/vfsub.h | 2 ++
+ fs/aufs25/dir.c | 1 +
+ fs/aufs25/f_op.c | 1 +
+ fs/aufs25/i_op.c | 26 ++++++++++++++------------
+ fs/aufs25/inode.h | 1 +
+ fs/aufs25/misc.c | 5 ++---
+ fs/aufs25/vfsub.c | 13 ++++++++++---
+ fs/aufs25/vfsub.h | 2 ++
7 files changed, 31 insertions(+), 18 deletions(-)
---- a/fs/aufs/dir.c
-+++ b/fs/aufs/dir.c
-@@ -573,4 +573,5 @@ struct file_operations aufs_dir_fop = {
+--- a/fs/aufs25/dir.c
++++ b/fs/aufs25/dir.c
+@@ -570,4 +570,5 @@ struct file_operations aufs_dir_fop = {
.release = aufs_release_dir,
.flush = aufs_flush,
.fsync = aufs_fsync_dir,
+ .fsetattr = aufs_fsetattr,
};
---- a/fs/aufs/f_op.c
-+++ b/fs/aufs/f_op.c
-@@ -880,4 +880,5 @@ struct file_operations aufs_file_fop = {
+--- a/fs/aufs25/f_op.c
++++ b/fs/aufs25/f_op.c
+@@ -658,4 +658,5 @@ struct file_operations aufs_file_fop = {
.splice_write = aufs_splice_write,
.splice_read = aufs_splice_read,
#endif
+ .fsetattr = aufs_fsetattr,
};
---- a/fs/aufs/i_op.c
-+++ b/fs/aufs/i_op.c
-@@ -622,7 +622,8 @@ static long aufs_fallocate(struct inode
+--- a/fs/aufs25/i_op.c
++++ b/fs/aufs25/i_op.c
+@@ -608,7 +608,8 @@ static long aufs_fallocate(struct inode
}
#endif
@@ -45,7 +45,7 @@
{
int err;
struct inode *inode;
-@@ -630,7 +631,6 @@ static int aufs_setattr(struct dentry *d
+@@ -616,7 +617,6 @@ static int aufs_setattr(struct dentry *d
struct vfsub_args vargs;
struct super_block *sb;
__u32 events;
@@ -53,7 +53,7 @@
loff_t sz;
struct au_icpup_args rargs;
-@@ -641,13 +641,8 @@ static int aufs_setattr(struct dentry *d
+@@ -627,13 +627,8 @@ static int aufs_setattr(struct dentry *d
sb = dentry->d_sb;
si_read_lock(sb, AuLock_FLUSH);
@@ -63,12 +63,12 @@
- file = ia->ia_file;
+ if (file)
fi_write_lock(file);
-- ia->ia_file = au_h_fptr(file);
+- ia->ia_file = au_h_fptr(file, au_fbstart(file));
- }
sz = -1;
if ((ia->ia_valid & ATTR_SIZE)
-@@ -785,16 +780,23 @@ static int aufs_setattr(struct dentry *d
+@@ -679,16 +674,23 @@ static int aufs_setattr(struct dentry *d
}
di_write_unlock(dentry);
out:
@@ -93,12 +93,12 @@
+ return aufs_do_setattr(file->f_dentry, ia, file);
+}
+
- /* currently, for fuse only */
- #ifdef CONFIG_AUFS_WORKAROUND_FUSE
- static int aufs_getattr(struct vfsmount *mnt, struct dentry *dentry,
---- a/fs/aufs/inode.h
-+++ b/fs/aufs/inode.h
-@@ -55,6 +55,7 @@ int aufs_read_inode(struct inode *inode)
+ /* ---------------------------------------------------------------------- */
+
+ static int h_readlink(struct dentry *dentry, int bindex, char __user *buf,
+--- a/fs/aufs25/inode.h
++++ b/fs/aufs25/inode.h
+@@ -65,6 +65,7 @@ int au_test_h_perm_sio(struct inode *h_i
/* i_op.c */
extern struct inode_operations aufs_iop, aufs_symlink_iop, aufs_dir_iop;
@@ -106,24 +106,24 @@
/* au_wr_dir flags */
#define AuWrDir_ADD_ENTRY 1
---- a/fs/aufs/misc.c
-+++ b/fs/aufs/misc.c
-@@ -266,10 +266,9 @@ int au_copy_file(struct file *dst, struc
+--- a/fs/aufs25/misc.c
++++ b/fs/aufs25/misc.c
+@@ -286,10 +286,9 @@ int au_copy_file(struct file *dst, struc
} while (err == -EAGAIN || err == -EINTR);
if (err == 1) {
ia->ia_size = dst->f_pos;
- ia->ia_valid = ATTR_SIZE | ATTR_FILE;
- ia->ia_file = dst;
+ ia->ia_valid = ATTR_SIZE;
- vfsub_i_lock_nested(h_i, AuLsc_I_CHILD2);
+ mutex_lock_nested(&h_i->i_mutex, AuLsc_I_CHILD2);
- err = vfsub_notify_change(h_d, ia, &vargs);
+ err = vfsub_fnotify_change(h_d, ia, &vargs, dst);
- vfsub_i_unlock(h_i);
+ mutex_unlock(&h_i->i_mutex);
}
}
---- a/fs/aufs/vfsub.c
-+++ b/fs/aufs/vfsub.c
-@@ -1119,6 +1119,7 @@ struct notify_change_args {
+--- a/fs/aufs25/vfsub.c
++++ b/fs/aufs25/vfsub.c
+@@ -463,6 +463,7 @@ struct notify_change_args {
struct dentry *h_dentry;
struct iattr *ia;
struct vfsub_args *vargs;
@@ -131,18 +131,18 @@
};
static void call_notify_change(void *args)
-@@ -1135,7 +1136,7 @@ static void call_notify_change(void *arg
+@@ -479,7 +480,7 @@ static void call_notify_change(void *arg
if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) {
vfsub_ignore(a->vargs);
lockdep_off();
-- *a->errp = notify_change(a->h_dentry, 0, a->ia);
-+ *a->errp = fnotify_change(a->h_dentry, 0, a->ia, a->file);
+- *a->errp = notify_change(a->h_dentry, NULL, a->ia);
++ *a->errp = fnotify_change(a->h_dentry, NULL, a->ia, a->file);
lockdep_on();
if (!*a->errp)
au_update_fuse_h_inode(NULL, a->h_dentry); /*ignore*/
-@@ -1145,8 +1146,8 @@ static void call_notify_change(void *arg
- AuTraceErr(*a->errp);
+@@ -510,8 +511,8 @@ static void vfsub_notify_change_dlgt(str
}
+ #endif
-int vfsub_notify_change(struct dentry *dentry, struct iattr *ia,
- struct vfsub_args *vargs)
@@ -151,7 +151,7 @@
{
int err;
struct notify_change_args args = {
-@@ -1173,6 +1174,12 @@ int vfsub_notify_change(struct dentry *d
+@@ -527,6 +528,12 @@ int vfsub_notify_change(struct dentry *d
return err;
}
@@ -164,9 +164,9 @@
/* ---------------------------------------------------------------------- */
struct unlink_args {
---- a/fs/aufs/vfsub.h
-+++ b/fs/aufs/vfsub.h
-@@ -613,6 +613,8 @@ int vfsub_sio_rmdir(struct inode *dir, s
+--- a/fs/aufs25/vfsub.h
++++ b/fs/aufs25/vfsub.h
+@@ -483,6 +483,8 @@ int vfsub_sio_rmdir(struct inode *dir, s
/* ---------------------------------------------------------------------- */
++++++ aufs-stack-protect-stub.diff ++++++
--- /var/tmp/diff_new_pack.bO2928/_old 2008-04-30 11:49:51.000000000 +0200
+++ /var/tmp/diff_new_pack.bO2928/_new 2008-04-30 11:49:51.000000000 +0200
@@ -1,10 +1,13 @@
-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;
+---
+ fs/aufs25/sysaufs.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/fs/aufs25/sysaufs.c
++++ b/fs/aufs25/sysaufs.c
+@@ -572,3 +572,8 @@ void sysaufs_fin(void)
+ sysfs_remove_group(&aufs_subsys.kobj, &sysaufs_attr_group);
+ kset_unregister(&aufs_subsys);
}
- #endif
+
+#ifndef CONFIG_CC_STACKPROTECTOR
+void __stack_chk_fail(void)
++++++ local.mk-fix ++++++
--- /var/tmp/diff_new_pack.bO2928/_old 2008-04-30 11:49:51.000000000 +0200
+++ /var/tmp/diff_new_pack.bO2928/_new 2008-04-30 11:49:51.000000000 +0200
@@ -1,11 +1,16 @@
---- aufs/local.mk.orig 2007-03-27 14:44:56.000000000 +0200
-+++ aufs/local.mk 2007-05-09 13:19:07.000000000 +0200
-@@ -76,7 +76,7 @@
- test ! -e $@ && ln -s $< $@ || :
- fs/aufs/aufs.ko: FORCE
+From: Jeff M
+---
+ local.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/local.mk
++++ b/local.mk
+@@ -136,7 +136,7 @@ aufs.ko: fs/aufs/aufs.ko
+ ${TgtPath}/aufs.ko: FORCE
# @echo ${AUFS_DEF_CONFIG}
-- ${MAKE} -C ${KDIR} M=${CURDIR}/fs/aufs modules
+ @echo ${TgtPath}
+- ${MAKE} -C ${KDIR} M=${CURDIR}/${TgtPath} modules
+ ${MAKE} -C ${KDIR} M=${M} modules
- fs/aufs/Kconfig: Kconfig.in
+ ${TgtPath}/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