Author: arekm Date: Thu Oct 21 07:58:57 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- aufs2 patch update
---- Files affected:
packages/kernel:
kernel-aufs2.patch (1.9 -> 1.10) , kernel.spec (1.838 -> 1.839)
---- Diffs:
================================================================
Index: packages/kernel/kernel-aufs2.patch
diff -u packages/kernel/kernel-aufs2.patch:1.9
packages/kernel/kernel-aufs2.patch:1.10
--- packages/kernel/kernel-aufs2.patch:1.9 Fri Oct 1 14:09:30 2010
+++ packages/kernel/kernel-aufs2.patch Thu Oct 21 09:58:51 2010
@@ -1,7 +1,7 @@
-aufs2.1 kbuild patch for linux-2.6.35
+aufs2 kbuild patch for linux-2.6.
diff --git a/fs/Kconfig b/fs/Kconfig
-index 5f85b59..6ee7cf8 100644
+index 3d18530..8f582e1 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -189,6 +189,7 @@ source "fs/romfs/Kconfig"
@@ -22,24 +22,24 @@
obj-$(CONFIG_CEPH_FS) += ceph/
+obj-$(CONFIG_AUFS_FS) += aufs/
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index 2fc8e14..3b766a7 100644
+index 626b629..a841231 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
-@@ -34,6 +34,7 @@ header-y += atmppp.h
+@@ -60,6 +60,7 @@ header-y += atmppp.h
header-y += atmsap.h
header-y += atmsvc.h
- header-y += atm_zatm.h
+ header-y += audit.h
+header-y += aufs_type.h
+ header-y += auto_fs.h
header-y += auto_fs4.h
- header-y += ax25.h
- header-y += b1lli.h
-aufs2.1 base patch for linux-2.6.35
+ header-y += auxvec.h
+aufs2 base patch for linux-2.6.
diff --git a/fs/namei.c b/fs/namei.c
-index 868d0cb..6e92c81 100644
+index 17ea76b..56e8ece 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -1178,7 +1178,7 @@ out:
+@@ -1168,7 +1168,7 @@ out:
* needs parent already locked. Doesn't follow mounts.
* SMP-safe.
*/
@@ -48,7 +48,7 @@
{
int err;
-@@ -1188,7 +1188,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1178,7 +1178,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
@@ -58,10 +58,10 @@
{
unsigned long hash;
diff --git a/fs/splice.c b/fs/splice.c
-index efdbfec..e01a51e 100644
+index 8f1dfae..278c94f 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1104,8 +1104,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
/*
* Attempt to initiate a splice from pipe to file.
*/
@@ -72,7 +72,7 @@
{
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
loff_t *, size_t, unsigned int);
-@@ -1132,9 +1132,9 @@ static long do_splice_from(struct pipe_inode_info *pipe,
struct file *out,
+@@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe,
struct file *out,
/*
* Attempt to initiate a splice from a file to a pipe.
*/
@@ -114,45 +114,13 @@
+ unsigned int flags);
+
#endif
-aufs2.1 standalone patch for linux-2.6.35
+aufs2 standalone patch for linux-2.6.
-diff --git a/fs/file_table.c b/fs/file_table.c
-index 5c7d10e..9031acf 100644
---- a/fs/file_table.c
-+++ b/fs/file_table.c
-@@ -34,6 +34,7 @@ struct files_stat_struct files_stat = {
-
- /* public. Not pretty! */
- __cacheline_aligned_in_smp DEFINE_SPINLOCK(files_lock);
-+EXPORT_SYMBOL(files_lock);
-
- /* SLAB cache for file structures */
- static struct kmem_cache *filp_cachep __read_mostly;
-@@ -346,6 +347,7 @@ void file_kill(struct file *file)
- file_list_unlock();
- }
- }
-+EXPORT_SYMBOL(file_kill);
-
- int fs_may_remount_ro(struct super_block *sb)
- {
-diff --git a/fs/inode.c b/fs/inode.c
-index 722860b..bfb0698 100644
---- a/fs/inode.c
-+++ b/fs/inode.c
-@@ -84,6 +84,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
- * the i_state of an inode while it is in use..
- */
- DEFINE_SPINLOCK(inode_lock);
-+EXPORT_SYMBOL(inode_lock);
-
- /*
- * iprune_sem provides exclusion between the kswapd or try_to_free_pages
diff --git a/fs/namei.c b/fs/namei.c
-index 6e92c81..334130e 100644
+index 56e8ece..ba75f28 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -348,6 +348,7 @@ int deny_write_access(struct file * file)
+@@ -347,6 +347,7 @@ int deny_write_access(struct file * file)
return 0;
}
@@ -160,7 +128,7 @@
/**
* path_get - get a reference to a path
-@@ -1187,6 +1188,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1177,6 +1178,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
return ERR_PTR(err);
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
@@ -168,7 +136,7 @@
int __lookup_one_len(const char *name, struct qstr *this,
struct dentry *base, int len)
-@@ -1209,6 +1211,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
+@@ -1199,6 +1201,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
this->hash = end_name_hash(hash);
return 0;
}
@@ -177,10 +145,10 @@
/**
* lookup_one_len - filesystem helper to lookup single pathname component
diff --git a/fs/namespace.c b/fs/namespace.c
-index 88058de..397afcc 100644
+index 2e10cb1..8fa77c4 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1279,6 +1279,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *),
void *arg,
+@@ -1283,6 +1283,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *),
void *arg,
}
return 0;
}
@@ -189,7 +157,7 @@
static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
{
diff --git a/fs/notify/group.c b/fs/notify/group.c
-index 0e16771..3fab10a 100644
+index d309f38..f0e9568 100644
--- a/fs/notify/group.c
+++ b/fs/notify/group.c
@@ -22,6 +22,7 @@
@@ -200,68 +168,60 @@
#include <linux/fsnotify_backend.h>
#include "fsnotify.h"
-@@ -169,6 +170,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
- fsnotify_recalc_global_mask();
- fsnotify_destroy_group(group);
+@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+ if (atomic_dec_and_test(&group->refcnt))
+ fsnotify_destroy_group(group);
}
+EXPORT_SYMBOL(fsnotify_put_group);
/*
- * Simply run the fsnotify_groups list and find a group which matches
-@@ -252,3 +254,4 @@ struct fsnotify_group *fsnotify_obtain_group(unsigned int
group_num, __u32 mask,
+ * Create a new fsnotify_group and hold a reference for the group returned.
+@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct
fsnotify_ops *ops)
return group;
}
-+EXPORT_SYMBOL(fsnotify_obtain_group);
-diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c
-index 0399bcb..74cdc13 100644
---- a/fs/notify/inode_mark.c
-+++ b/fs/notify/inode_mark.c
-@@ -105,6 +105,7 @@ void fsnotify_put_mark(struct fsnotify_mark_entry *entry)
- if (atomic_dec_and_test(&entry->refcnt))
- entry->free_mark(entry);
++EXPORT_SYMBOL(fsnotify_alloc_group);
+diff --git a/fs/notify/mark.c b/fs/notify/mark.c
+index 325185e..adede09 100644
+--- a/fs/notify/mark.c
++++ b/fs/notify/mark.c
+@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
+ if (atomic_dec_and_test(&mark->refcnt))
+ mark->free_mark(mark);
}
+EXPORT_SYMBOL(fsnotify_put_mark);
/*
- * Recalculate the mask of events relevant to a given inode locked.
-@@ -215,6 +216,7 @@ void fsnotify_destroy_mark_by_entry(struct
fsnotify_mark_entry *entry)
+ * Any time a mark is getting freed we end up here.
+@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
if (unlikely(atomic_dec_and_test(&group->num_marks)))
fsnotify_final_destroy_group(group);
}
-+EXPORT_SYMBOL(fsnotify_destroy_mark_by_entry);
++EXPORT_SYMBOL(fsnotify_destroy_mark);
- /*
- * Given a group, destroy all of the marks associated with that group.
-@@ -281,6 +283,7 @@ struct fsnotify_mark_entry
*fsnotify_find_mark_entry(struct fsnotify_group *grou
- }
- return NULL;
- }
-+EXPORT_SYMBOL(fsnotify_find_mark_entry);
+ void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
+ {
+@@ -277,6 +279,7 @@ err:
- /*
- * Nothing fancy, just initialize lists and locks and counters.
-@@ -297,6 +300,7 @@ void fsnotify_init_mark(struct fsnotify_mark_entry *entry,
- entry->inode = NULL;
- entry->free_mark = free_mark;
+ return ret;
}
-+EXPORT_SYMBOL(fsnotify_init_mark);
++EXPORT_SYMBOL(fsnotify_add_mark);
/*
- * Attach an initialized mark entry to a given group and inode.
-@@ -352,6 +356,7 @@ int fsnotify_add_mark(struct fsnotify_mark_entry *entry,
-
- return ret;
+ * clear any marks in a group in which mark->flags & flags is true
+@@ -332,6 +335,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+ atomic_set(&mark->refcnt, 1);
+ mark->free_mark = free_mark;
}
-+EXPORT_SYMBOL(fsnotify_add_mark);
++EXPORT_SYMBOL(fsnotify_init_mark);
- /**
- * fsnotify_unmount_inodes - an sb is unmounting. handle any watched inodes.
+ static int fsnotify_mark_destroy(void *ignored)
+ {
diff --git a/fs/open.c b/fs/open.c
-index 5463266..d248ead 100644
+index 630715f..1c864c7 100644
--- a/fs/open.c
+++ b/fs/open.c
-@@ -59,6 +59,7 @@ int do_truncate(struct dentry *dentry, loff_t length,
unsigned int time_attrs,
+@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length,
unsigned int time_attrs,
mutex_unlock(&dentry->d_inode->i_mutex);
return ret;
}
@@ -270,10 +230,10 @@
static long do_sys_truncate(const char __user *pathname, loff_t length)
{
diff --git a/fs/splice.c b/fs/splice.c
-index e01a51e..4806358 100644
+index 278c94f..033f7ac 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1128,6 +1128,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct
file *out,
+@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct
file *out,
return splice_write(pipe, out, ppos, len, flags);
}
@@ -281,7 +241,7 @@
/*
* Attempt to initiate a splice from a file to a pipe.
-@@ -1154,6 +1155,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return splice_read(in, ppos, pipe, len, flags);
}
@@ -311,7 +271,7 @@
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/security.c b/security/security.c
-index 351942a..6ba84a8 100644
+index c53949f..0ae5b91 100644
--- a/security/security.c
+++ b/security/security.c
@@ -376,6 +376,7 @@ int security_path_mkdir(struct path *dir, struct dentry
*dentry, int mode)
@@ -360,17 +320,17 @@
}
+EXPORT_SYMBOL(security_path_rename);
- int security_path_truncate(struct path *path, loff_t length,
- unsigned int time_attrs)
-@@ -424,6 +430,7 @@ int security_path_truncate(struct path *path, loff_t
length,
+ int security_path_truncate(struct path *path)
+ {
+@@ -423,6 +429,7 @@ int security_path_truncate(struct path *path)
return 0;
- return security_ops->path_truncate(path, length, time_attrs);
+ return security_ops->path_truncate(path);
}
+EXPORT_SYMBOL(security_path_truncate);
int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
mode_t mode)
-@@ -432,6 +439,7 @@ int security_path_chmod(struct dentry *dentry, struct
vfsmount *mnt,
+@@ -431,6 +438,7 @@ int security_path_chmod(struct dentry *dentry, struct
vfsmount *mnt,
return 0;
return security_ops->path_chmod(dentry, mnt, mode);
}
@@ -378,7 +338,7 @@
int security_path_chown(struct path *path, uid_t uid, gid_t gid)
{
-@@ -439,6 +447,7 @@ int security_path_chown(struct path *path, uid_t uid,
gid_t gid)
+@@ -438,6 +446,7 @@ int security_path_chown(struct path *path, uid_t uid,
gid_t gid)
return 0;
return security_ops->path_chown(path, uid, gid);
}
@@ -386,7 +346,7 @@
int security_path_chroot(struct path *path)
{
-@@ -515,6 +524,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -514,6 +523,7 @@ int security_inode_readlink(struct dentry *dentry)
return 0;
return security_ops->inode_readlink(dentry);
}
@@ -394,7 +354,7 @@
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
{
-@@ -529,6 +539,7 @@ int security_inode_permission(struct inode *inode, int
mask)
+@@ -528,6 +538,7 @@ int security_inode_permission(struct inode *inode, int
mask)
return 0;
return security_ops->inode_permission(inode, mask);
}
@@ -402,15 +362,15 @@
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
-@@ -622,6 +633,7 @@ int security_file_permission(struct file *file, int mask)
- {
- return security_ops->file_permission(file, mask);
+@@ -627,6 +638,7 @@ int security_file_permission(struct file *file, int mask)
+
+ return fsnotify_perm(file, mask);
}
+EXPORT_SYMBOL(security_file_permission);
int security_file_alloc(struct file *file)
{
-@@ -649,6 +661,7 @@ int security_file_mmap(struct file *file, unsigned long
reqprot,
+@@ -654,6 +666,7 @@ int security_file_mmap(struct file *file, unsigned long
reqprot,
return ret;
return ima_file_mmap(file, prot);
}
@@ -420,7 +380,7 @@
unsigned long prot)
diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs
linux/Documentation/ABI/testing/debugfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs 1970-01-01
01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/debugfs-aufs 2010-10-01
13:09:26.340878164 +0200
++++ linux/Documentation/ABI/testing/debugfs-aufs 2010-10-21
09:52:43.080290296 +0200
@@ -0,0 +1,37 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
@@ -461,7 +421,7 @@
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs
linux/Documentation/ABI/testing/sysfs-aufs
--- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs 1970-01-01
01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/sysfs-aufs 2010-10-01 13:09:26.340878164
+0200
++++ linux/Documentation/ABI/testing/sysfs-aufs 2010-10-21 09:52:43.080290296
+0200
@@ -0,0 +1,24 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@@ -489,7 +449,7 @@
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
--- /usr/share/empty/fs/aufs/aufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/aufs.h 2010-10-01 13:09:26.342878167 +0200
++++ linux/fs/aufs/aufs.h 2010-10-21 09:52:43.083624114 +0200
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2005-2010 Junjiro R. Okajima
@@ -554,8 +514,8 @@
+#endif /* __AUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
--- /usr/share/empty/fs/aufs/branch.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c 2010-10-01 13:09:26.343878167 +0200
-@@ -0,0 +1,1008 @@
++++ linux/fs/aufs/branch.c 2010-10-21 09:52:43.086957936 +0200
+@@ -0,0 +1,1005 @@
+/*
+ * Copyright (C) 2005-2010 Junjiro R. Okajima
+ *
@@ -879,11 +839,11 @@
+ * a limit for rmdir/rename a dir
+ * cf. AUFS_MAX_NAMELEN in include/linux/aufs_type.h
+ */
-+ h_dentry = path->dentry;
-+ err = vfs_statfs(h_dentry, &kst);
++ err = vfs_statfs(path, &kst);
+ if (unlikely(err))
+ goto out;
+ err = -EINVAL;
++ h_dentry = path->dentry;
+ if (kst.f_namelen >= NAME_MAX)
+ err = au_br_init_wh(sb, br, perm, h_dentry);
+ else
@@ -994,6 +954,7 @@
+
+ root = sb->s_root;
+ root_inode = root->d_inode;
++ au_plink_maint_block(sb);
+ bend = au_sbend(sb);
+ amount = bend + 1 - bindex;
+ au_br_do_add_brp(au_sbi(sb), bindex, br, bend, amount);
@@ -1271,6 +1232,7 @@
+
+ root = sb->s_root;
+ inode = root->d_inode;
++ au_plink_maint_block(sb);
+ sbinfo = au_sbi(sb);
+ bend = sbinfo->si_bend;
+
@@ -1315,7 +1277,8 @@
+ i = atomic_read(&br->br_count);
+ if (unlikely(i)) {
+ AuVerbose(verbose, "%d file(s) opened\n", i);
-+ goto out;
++ if (!verbose)
++ goto out;
+ }
+
+ wbr = br->br_wbr;
@@ -1378,7 +1341,7 @@
+{
+#ifdef CONFIG_IMA
+ /* since it doesn't support mark_files_ro() */
-+ AuWarn1("RW -> RO makes IMA to produce wrong message");
++ pr_warning("RW -> RO makes IMA to produce wrong message");
+#endif
+}
+
@@ -1397,11 +1360,8 @@
+{
+ int err;
+ unsigned long n, ul, bytes, files;
-+ aufs_bindex_t br_id;
++ aufs_bindex_t bstart;
+ struct file *file, *hf, **a;
-+ struct dentry *dentry;
-+ struct inode *inode;
-+ struct au_hfile *hfile;
+ const int step_bytes = 1024, /* memory allocation unit */
+ step_files = step_bytes / sizeof(*a);
+
@@ -1414,12 +1374,9 @@
+ goto out;
+
+ /* no need file_list_lock() since sbinfo is locked? defered? */
-+ br_id = au_sbr_id(sb, bindex);
+ list_for_each_entry(file, &sb->s_files, f_u.fu_list) {
+ if (special_file(file->f_dentry->d_inode->i_mode))
+ continue;
-+ dentry = file->f_dentry;
-+ inode = dentry->d_inode;
+
+ AuDbg("%.*s\n", AuDLNPair(file->f_dentry));
+ fi_read_lock(file);
@@ -1430,17 +1387,16 @@
+ goto out_free;
+ }
+
-+ hfile = &au_fi(file)->fi_htop;
-+ hf = hfile->hf_file;
-+ if (!S_ISREG(inode->i_mode)
++ bstart = au_fbstart(file);
++ if (!S_ISREG(file->f_dentry->d_inode->i_mode)
+ || !(file->f_mode & FMODE_WRITE)
-+ || hfile->hf_br->br_id != br_id
-+ || !(hf->f_mode & FMODE_WRITE)) {
++ || bstart != bindex) {
+ FiMustNoWaiters(file);
+ fi_read_unlock(file);
+ continue;
+ }
+
++ hf = au_hf_top(file);
+ FiMustNoWaiters(file);
+ fi_read_unlock(file);
+
@@ -1491,6 +1447,7 @@
+ struct au_branch *br;
+
+ root = sb->s_root;
++ au_plink_maint_block(sb);
+ bindex = au_find_dbindex(root, mod->h_root);
+ if (bindex < 0) {
+ if (remount)
@@ -1566,7 +1523,7 @@
+}
diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
--- /usr/share/empty/fs/aufs/branch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.h 2010-10-01 13:09:26.343878167 +0200
++++ linux/fs/aufs/branch.h 2010-10-21 09:52:43.086957936 +0200
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2005-2010 Junjiro R. Okajima
@@ -1765,7 +1722,7 @@
+
+static inline void au_sbr_put(struct super_block *sb, aufs_bindex_t bindex)
+{
-+ atomic_dec(&au_sbr(sb, bindex)->br_count);
++ atomic_dec_return(&au_sbr(sb, bindex)->br_count);
+}
+
+static inline int au_sbr_perm(struct super_block *sb, aufs_bindex_t bindex)
@@ -1794,8 +1751,8 @@
+#endif /* __AUFS_BRANCH_H__ */
diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
--- /usr/share/empty/fs/aufs/conf.mk 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/conf.mk 2010-10-01 13:09:26.343878167 +0200
-@@ -0,0 +1,37 @@
++++ linux/fs/aufs/conf.mk 2010-10-21 09:52:43.086957936 +0200
+@@ -0,0 +1,36 @@
+
+AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
+
@@ -1806,8 +1763,7 @@
+endef
+
+AuConfAll = BRANCH_MAX_127 BRANCH_MAX_511 BRANCH_MAX_1023 BRANCH_MAX_32767 \
-+ SBILIST \
-+ HNOTIFY HFSNOTIFY HINOTIFY \
++ HNOTIFY HFSNOTIFY \
+ EXPORT INO_T_64 \
+ RDU \
+ SP_IATTR \
@@ -1835,7 +1791,7 @@
+-include ${srctree}/${src}/conf_priv.mk
diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
--- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c 2010-10-01 13:09:26.343878167 +0200
++++ linux/fs/aufs/cpup.c 2010-10-21 09:52:43.086957936 +0200
@@ -0,0 +1,1059 @@
+/*
+ * Copyright (C) 2005-2010 Junjiro R. Okajima
@@ -2898,7 +2854,7 @@
+}
diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
--- /usr/share/empty/fs/aufs/cpup.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.h 2010-10-01 13:09:26.343878167 +0200
++++ linux/fs/aufs/cpup.h 2010-10-21 09:52:43.086957936 +0200
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2005-2010 Junjiro R. Okajima
@@ -2983,7 +2939,7 @@
+#endif /* __AUFS_CPUP_H__ */
diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
--- /usr/share/empty/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c 2010-10-01 13:09:26.343878167 +0200
++++ linux/fs/aufs/dbgaufs.c 2010-10-21 09:52:43.086957936 +0200
@@ -0,0 +1,334 @@
+/*
+ * Copyright (C) 2005-2010 Junjiro R. Okajima
@@ -3321,7 +3277,7 @@
+}
diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
--- /usr/share/empty/fs/aufs/dbgaufs.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.h 2010-10-01 13:09:26.343878167 +0200
++++ linux/fs/aufs/dbgaufs.h 2010-10-21 09:52:43.086957936 +0200
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005-2010 Junjiro R. Okajima
@@ -3377,7 +3333,7 @@
+#endif /* __DBGAUFS_H__ */
diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
--- /usr/share/empty/fs/aufs/dcsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.c 2010-10-01 13:09:26.343878167 +0200
++++ linux/fs/aufs/dcsub.c 2010-10-21 09:52:43.086957936 +0200
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2005-2010 Junjiro R. Okajima
@@ -3581,7 +3537,7 @@
+}
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs2.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.838&r2=1.839&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
