packages: kernel/kernel-aufs3.patch, kernel/kernel-imq.patch, kernel/kernel...
arekm
arekm at pld-linux.org
Mon Mar 19 15:14:16 CET 2012
Author: arekm Date: Mon Mar 19 14:14:16 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- kernel-nf_rtsp.patch dropped (upstream provides module that can be built without a need to patch kernel); wrr dropped (upstream suggests using drr instead); update other patches for 3.3
---- Files affected:
packages/kernel:
kernel-aufs3.patch (1.7 -> 1.8) , kernel-imq.patch (1.16 -> 1.17) , kernel-layer7.patch (1.6 -> 1.7) , kernel-virtio-gl-accel.patch (1.1 -> 1.2) , kernel.spec (1.1030 -> 1.1031) , kernel-nf_rtsp.patch (1.4 -> NONE) (REMOVED), kernel-wrr.config (1.1 -> NONE) (REMOVED), kernel-wrr.patch (1.9 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/kernel/kernel-aufs3.patch
diff -u packages/kernel/kernel-aufs3.patch:1.7 packages/kernel/kernel-aufs3.patch:1.8
--- packages/kernel/kernel-aufs3.patch:1.7 Mon Feb 13 22:21:03 2012
+++ packages/kernel/kernel-aufs3.patch Mon Mar 19 15:14:10 2012
@@ -1,7 +1,7 @@
-aufs3.2 kbuild patch
+aufs3.x-rcN kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
-index 5f4c45d..357a8a6 100644
+index d621f02..9b9694c 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -215,6 +215,7 @@ source "fs/pstore/Kconfig"
@@ -13,16 +13,16 @@
endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile
-index d2c3353..680ad8a 100644
+index 93804d4..cf3dcb9 100644
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -123,3 +123,4 @@ obj-$(CONFIG_GFS2_FS) += gfs2/
+@@ -124,3 +124,4 @@ obj-$(CONFIG_GFS2_FS) += gfs2/
obj-y += exofs/ # Multiple modules
obj-$(CONFIG_CEPH_FS) += ceph/
obj-$(CONFIG_PSTORE) += pstore/
+obj-$(CONFIG_AUFS_FS) += aufs/
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index 619b565..29f386b 100644
+index c94e717..fccb9df 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -65,6 +65,7 @@ header-y += atmppp.h
@@ -33,13 +33,13 @@
header-y += auto_fs.h
header-y += auto_fs4.h
header-y += auxvec.h
-aufs3.2 base patch
+aufs3.x-rcN base patch
diff --git a/fs/namei.c b/fs/namei.c
-index 5008f01..4cc94cf 100644
+index e2ba628..fde8ea2 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
+@@ -1781,7 +1781,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
* needs parent already locked. Doesn't follow mounts.
* SMP-safe.
*/
@@ -49,10 +49,10 @@
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
diff --git a/fs/splice.c b/fs/splice.c
-index fa2defa..e3569b0 100644
+index 1ec0493..c599f73 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
/*
* Attempt to initiate a splice from pipe to file.
*/
@@ -63,7 +63,7 @@
{
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
loff_t *, size_t, unsigned int);
-@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1112,9 +1112,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.
*/
@@ -103,10 +103,10 @@
+ struct pipe_inode_info *pipe, size_t len,
+ unsigned int flags);
#endif
-aufs3.2 standalone patch
+aufs3.x-rcN standalone patch
diff --git a/fs/file_table.c b/fs/file_table.c
-index c322794..2aad244 100644
+index 20002e3..6d792ad 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file)
@@ -119,10 +119,10 @@
/*
diff --git a/fs/inode.c b/fs/inode.c
-index ee4e66b..728042b 100644
+index d3ebdbe..6db6251 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
+@@ -66,6 +66,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
__cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
@@ -131,10 +131,10 @@
/*
* Empty aops. Can be used for the cases where the user does not
diff --git a/fs/namei.c b/fs/namei.c
-index 4cc94cf..af19e30 100644
+index fde8ea2..62f2302 100644
--- a/fs/namei.c
+++ b/fs/namei.c
-@@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1785,6 +1785,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
{
return __lookup_hash(&nd->last, nd->path.dentry, nd);
}
@@ -143,16 +143,16 @@
/**
* lookup_one_len - filesystem helper to lookup single pathname component
diff --git a/fs/namespace.c b/fs/namespace.c
-index cfc6d44..173d15a 100644
+index e608199..38fcc2e 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1339,6 +1339,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
}
return 0;
}
+EXPORT_SYMBOL(iterate_mounts);
- static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
+ static void cleanup_group_ids(struct mount *mnt, struct mount *end)
{
diff --git a/fs/notify/group.c b/fs/notify/group.c
index 63fc294..6f4adca 100644
@@ -180,7 +180,7 @@
}
+EXPORT_SYMBOL(fsnotify_alloc_group);
diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index e14587d..be6533b 100644
+index f104d56..54f36db 100644
--- a/fs/notify/mark.c
+++ b/fs/notify/mark.c
@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
@@ -191,7 +191,7 @@
/*
* Any time a mark is getting freed we end up here.
-@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
+@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
if (unlikely(atomic_dec_and_test(&group->num_marks)))
fsnotify_final_destroy_group(group);
}
@@ -199,7 +199,7 @@
void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
{
-@@ -276,6 +278,7 @@ err:
+@@ -278,6 +280,7 @@ err:
return ret;
}
@@ -207,7 +207,7 @@
/*
* clear any marks in a group in which mark->flags & flags is true
-@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
atomic_set(&mark->refcnt, 1);
mark->free_mark = free_mark;
}
@@ -216,7 +216,7 @@
static int fsnotify_mark_destroy(void *ignored)
{
diff --git a/fs/open.c b/fs/open.c
-index 22c41b5..33b4033 100644
+index 77becc0..f634f02 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@@ -228,10 +228,10 @@
static long do_sys_truncate(const char __user *pathname, loff_t length)
{
diff --git a/fs/splice.c b/fs/splice.c
-index e3569b0..9dc07b7 100644
+index c599f73..00303ba 100644
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1108,6 +1108,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
return splice_write(pipe, out, ppos, len, flags);
}
@@ -239,7 +239,7 @@
/*
* Attempt to initiate a splice from a file to a pipe.
-@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1134,6 +1135,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
return splice_read(in, ppos, pipe, len, flags);
}
@@ -248,16 +248,16 @@
/**
* splice_direct_to_actor - splices data directly between two non-pipes
diff --git a/security/commoncap.c b/security/commoncap.c
-index ee4f848..611fd70 100644
+index 7ce191e..19a95be 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
-@@ -975,3 +975,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+@@ -965,3 +965,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
}
return ret;
}
+EXPORT_SYMBOL(cap_file_mmap);
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index 4450fbe..bc94175 100644
+index 8b5b5d8..911850c 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -7,6 +7,7 @@
@@ -268,7 +268,7 @@
#include <linux/list.h>
#include <linux/uaccess.h>
#include <linux/seq_file.h>
-@@ -500,6 +501,7 @@ found:
+@@ -501,6 +502,7 @@ found:
return -EPERM;
}
@@ -277,10 +277,10 @@
int devcgroup_inode_mknod(int mode, dev_t dev)
{
diff --git a/security/security.c b/security/security.c
-index e2f684a..892000c 100644
+index d754249..1aa6154 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+@@ -392,6 +392,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
return 0;
return security_ops->path_rmdir(dir, dentry);
}
@@ -288,7 +288,7 @@
int security_path_unlink(struct path *dir, struct dentry *dentry)
{
-@@ -427,6 +428,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+@@ -408,6 +409,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
return 0;
return security_ops->path_symlink(dir, dentry, old_name);
}
@@ -296,7 +296,7 @@
int security_path_link(struct dentry *old_dentry, struct path *new_dir,
struct dentry *new_dentry)
-@@ -435,6 +437,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+@@ -416,6 +418,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
return 0;
return security_ops->path_link(old_dentry, new_dir, new_dentry);
}
@@ -304,23 +304,23 @@
int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
struct path *new_dir, struct dentry *new_dentry)
-@@ -453,6 +456,7 @@ int security_path_truncate(struct path *path)
+@@ -434,6 +437,7 @@ int security_path_truncate(struct path *path)
return 0;
return security_ops->path_truncate(path);
}
+EXPORT_SYMBOL(security_path_truncate);
- int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
- mode_t mode)
-@@ -461,6 +465,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ int security_path_chmod(struct path *path, umode_t mode)
+ {
+@@ -441,6 +445,7 @@ int security_path_chmod(struct path *path, umode_t mode)
return 0;
- return security_ops->path_chmod(dentry, mnt, mode);
+ return security_ops->path_chmod(path, mode);
}
+EXPORT_SYMBOL(security_path_chmod);
int security_path_chown(struct path *path, uid_t uid, gid_t gid)
{
-@@ -468,6 +473,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+@@ -448,6 +453,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
return 0;
return security_ops->path_chown(path, uid, gid);
}
@@ -328,7 +328,7 @@
int security_path_chroot(struct path *path)
{
-@@ -544,6 +550,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -524,6 +530,7 @@ int security_inode_readlink(struct dentry *dentry)
return 0;
return security_ops->inode_readlink(dentry);
}
@@ -336,7 +336,7 @@
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
{
-@@ -558,6 +565,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -538,6 +545,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0;
return security_ops->inode_permission(inode, mask);
}
@@ -344,7 +344,7 @@
int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{
-@@ -673,6 +681,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -653,6 +661,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask);
}
@@ -352,7 +352,7 @@
int security_file_alloc(struct file *file)
{
-@@ -700,6 +709,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+@@ -680,6 +689,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
return ret;
return ima_file_mmap(file, prot);
}
@@ -362,7 +362,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 2012-02-13 21:54:56.963104881 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,37 @@
+What: /debug/aufs/si_<id>/
+Date: March 2009
@@ -403,7 +403,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 2012-02-13 21:54:56.963104881 +0100
++++ linux/Documentation/ABI/testing/sysfs-aufs 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,24 @@
+What: /sys/fs/aufs/si_<id>/
+Date: March 2009
@@ -431,7 +431,7 @@
+ will be empty. About XINO files, see the aufs manual.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt 2012-02-13 21:54:56.963104881 +0100
++++ linux/Documentation/filesystems/aufs/design/01intro.txt 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,162 @@
+
+# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -597,7 +597,7 @@
+about it. But currently I have implemented it in kernel space.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt 2012-02-13 21:54:56.963104881 +0100
++++ linux/Documentation/filesystems/aufs/design/02struct.txt 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,226 @@
+
+# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -827,7 +827,7 @@
+dir, aufs reverts it after copy-up.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt linux/Documentation/filesystems/aufs/design/03lookup.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2012-02-13 21:54:56.963104881 +0100
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,106 @@
+
+# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -937,7 +937,7 @@
+ by over-mounting something (or another method).
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt linux/Documentation/filesystems/aufs/design/04branch.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/04branch.txt 2012-02-13 21:54:56.966438287 +0100
++++ linux/Documentation/filesystems/aufs/design/04branch.txt 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,76 @@
+
+# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1017,7 +1017,7 @@
+ same named entry on the upper branch.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2012-02-13 21:54:56.966438287 +0100
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,65 @@
+
+# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1086,7 +1086,7 @@
+ copyup policy.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2012-02-13 21:54:56.966438287 +0100
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1137,7 +1137,7 @@
+switching the approach.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/07export.txt 2012-02-13 21:54:56.966438287 +0100
++++ linux/Documentation/filesystems/aufs/design/07export.txt 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,59 @@
+
+# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1200,7 +1200,7 @@
+ lookup_one_len(), vfs_getattr(), encode_fh() and others.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2012-02-13 21:54:56.966438287 +0100
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,53 @@
+
+# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1257,7 +1257,7 @@
+initramfs will use it to replace the old one at the next boot.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2012-02-13 21:54:56.966438287 +0100
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,47 @@
+
+# Copyright (C) 2010-2011 Junjiro R. Okajima
@@ -1308,7 +1308,7 @@
+vm_operations_struct for regular files only.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/99plan.txt linux/Documentation/filesystems/aufs/design/99plan.txt
--- /usr/share/empty/Documentation/filesystems/aufs/design/99plan.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/99plan.txt 2012-02-13 21:54:56.966438287 +0100
++++ linux/Documentation/filesystems/aufs/design/99plan.txt 2012-03-19 12:24:13.676467669 +0100
@@ -0,0 +1,96 @@
+
+# Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1408,8 +1408,8 @@
+Otherwise from /new.
diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README
--- /usr/share/empty/Documentation/filesystems/aufs/README 1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/README 2012-02-13 21:54:56.963104881 +0100
-@@ -0,0 +1,328 @@
++++ linux/Documentation/filesystems/aufs/README 2012-03-19 12:24:13.676467669 +0100
+@@ -0,0 +1,330 @@
+
+Aufs3 -- advanced multi layered unification filesystem version 3.x
+http://aufs.sf.net
@@ -1559,7 +1559,7 @@
+
+For (an unreleased) example:
+If you are using "linux-3.10" and the "aufs3.10" branch
-+does not exit in aufs-util repository, then "aufs3.9", "aufs3.8"
++does not exist in aufs-util repository, then "aufs3.9", "aufs3.8"
+or something numerically smaller is the branch for your kernel.
+
+Also you can view all branches by
@@ -1591,7 +1591,8 @@
+ =m or =y.
+- and build your kernel as usual.
+- install the built kernel.
-+- install the header files too by "make headers_install".
++- install the header files too by "make headers_install" to the
++ directory where you specify. By default, it is $PWD/usr.
+- and reboot your system.
+
+2.
@@ -1613,7 +1614,8 @@
+ ./aufs.ko to /lib/modules/... and run depmod -a (or reboot simply).
+ + run "make headers_install" to install the aufs header file (you can
+ specify DESTDIR), or copty ./usr/include/linux/aufs_type.h to
-+ /usr/include/linux or wherever you like.
++ /usr/include/linux or wherever you like. By default, the target
++ directory is $PWD/usr.
+- no need to apply aufs3-kbuild.patch, nor copying source files to your
+ kernel source tree.
+
@@ -1740,7 +1742,7 @@
+# End: ;
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 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/aufs.h 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -1804,7 +1806,7 @@
+#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 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/branch.c 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,1169 @@
+/*
+ * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -2977,7 +2979,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 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/branch.h 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -3211,7 +3213,7 @@
+#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 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/conf.mk 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,38 @@
+
+AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
@@ -3253,8 +3255,8 @@
+-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 2012-02-13 21:54:56.966438287 +0100
-@@ -0,0 +1,1079 @@
++++ linux/fs/aufs/cpup.c 2012-03-19 12:24:13.679801090 +0100
+@@ -0,0 +1,1084 @@
+/*
+ * Copyright (C) 2005-2012 Junjiro R. Okajima
+ *
@@ -3315,7 +3317,12 @@
+ && au_plink_test(inode))
+ return;
+
-+ set_nlink(inode, h_inode->i_nlink);
++ /*
++ * 0 can happen in revalidating.
++ * h_inode->i_mutex is not held, but it is harmless since once i_nlink
++ * reaches 0, it will never become positive.
++ */
++ vfsub_set_nlink(inode, h_inode->i_nlink);
+
+ /*
+ * fewer nlink makes find(1) noisy, but larger nlink doesn't.
@@ -4336,7 +4343,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 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/cpup.h 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -4421,7 +4428,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 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/dbgaufs.c 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,334 @@
+/*
+ * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -4759,7 +4766,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 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/dbgaufs.h 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -4812,7 +4819,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 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/dcsub.c 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -5059,7 +5066,7 @@
+}
diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
--- /usr/share/empty/fs/aufs/dcsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.h 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/dcsub.h 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -5157,7 +5164,7 @@
+#endif /* __AUFS_DCSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
--- /usr/share/empty/fs/aufs/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.c 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/debug.c 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,489 @@
+/*
+ * Copyright (C) 2005-2012 Junjiro R. Okajima
@@ -5650,7 +5657,7 @@
+}
diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
--- /usr/share/empty/fs/aufs/debug.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.h 2012-02-13 21:54:56.966438287 +0100
++++ linux/fs/aufs/debug.h 2012-03-19 12:24:13.679801090 +0100
@@ -0,0 +1,243 @@
+/*
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs3.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-imq.patch?r1=1.16&r2=1.17&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-layer7.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-virtio-gl-accel.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.1030&r2=1.1031&f=u
More information about the pld-cvs-commit
mailing list