packages: kernel/kernel-aufs2-unionfs.patch, kernel/kernel-aufs2.patch - up...

baggins baggins at pld-linux.org
Mon Jul 11 11:46:59 CEST 2011


Author: baggins                      Date: Mon Jul 11 09:46:59 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to latest aufs2 git source

---- Files affected:
packages/kernel:
   kernel-aufs2-unionfs.patch (1.3 -> 1.4) , kernel-aufs2.patch (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-aufs2-unionfs.patch
diff -u packages/kernel/kernel-aufs2-unionfs.patch:1.3 packages/kernel/kernel-aufs2-unionfs.patch:1.4
--- packages/kernel/kernel-aufs2-unionfs.patch:1.3	Mon Nov 22 12:55:30 2010
+++ packages/kernel/kernel-aufs2-unionfs.patch	Mon Jul 11 11:46:53 2011
@@ -71,21 +71,21 @@
 diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 --- /usr/share/empty/fs/aufs/vfsub.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux/fs/aufs/vfsub.c	2010-08-21 21:00:02.986708041 +0200
-@@ -530,7 +530,7 @@
- {
+@@ -530,7 +530,7 @@ long vfsub_splice_to
  	long err;
  
+ 	lockdep_off();
 -	err = do_splice_to(in, ppos, pipe, len, flags);
 +	err = vfs_splice_to(in, ppos, pipe, len, flags);
+ 	lockdep_on();
  	file_accessed(in);
  	if (err >= 0)
- 		vfsub_update_h_iattr(&in->f_path, /*did*/NULL); /*ignore*/
-@@ -542,7 +542,7 @@
- {
+@@ -542,7 +542,7 @@ long vfsub_splice_from
  	long err;
  
+ 	lockdep_off();
 -	err = do_splice_from(pipe, out, ppos, len, flags);
 +	err = vfs_splice_from(pipe, out, ppos, len, flags);
+ 	lockdep_on();
  	if (err >= 0)
  		vfsub_update_h_iattr(&out->f_path, /*did*/NULL); /*ignore*/
- 	return err;

================================================================
Index: packages/kernel/kernel-aufs2.patch
diff -u packages/kernel/kernel-aufs2.patch:1.20 packages/kernel/kernel-aufs2.patch:1.21
--- packages/kernel/kernel-aufs2.patch:1.20	Wed Jun 29 12:18:57 2011
+++ packages/kernel/kernel-aufs2.patch	Mon Jul 11 11:46:53 2011
@@ -1,10 +1,10 @@
 aufs2.1 kbuild patch for linux-2.6.
 
 diff --git a/fs/Kconfig b/fs/Kconfig
-index 3db9caa..c9e1f11 100644
+index 19891aa..b660b64 100644
 --- a/fs/Kconfig
 +++ b/fs/Kconfig
-@@ -190,6 +190,7 @@ source "fs/romfs/Kconfig"
+@@ -208,6 +208,7 @@ source "fs/pstore/Kconfig"
  source "fs/sysv/Kconfig"
  source "fs/ufs/Kconfig"
  source "fs/exofs/Kconfig"
@@ -13,19 +13,19 @@
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile
-index a7f7cef..95dd4d3 100644
+index fb68c2b..c031a85 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -122,3 +122,4 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
+@@ -124,3 +124,4 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
  obj-$(CONFIG_EXOFS_FS)          += exofs/
  obj-$(CONFIG_CEPH_FS)		+= ceph/
  obj-$(CONFIG_PSTORE)		+= pstore/
-+obj-$(CONFIG_AUFS_FS)		+= aufs/
++obj-$(CONFIG_AUFS_FS)           += aufs/
 diff --git a/include/linux/Kbuild b/include/linux/Kbuild
-index b0ada6f..5cb5837 100644
+index 01f6362..8b3b9f1 100644
 --- a/include/linux/Kbuild
 +++ b/include/linux/Kbuild
-@@ -64,6 +64,7 @@ header-y += atmppp.h
+@@ -65,6 +65,7 @@ header-y += atmppp.h
  header-y += atmsap.h
  header-y += atmsvc.h
  header-y += audit.h
@@ -36,10 +36,10 @@
 aufs2.1 base patch for linux-2.6.
 
 diff --git a/fs/namei.c b/fs/namei.c
-index 0087cf9..cd39cdf 100644
+index 0223c41..cc5dc02 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -1841,12 +1841,12 @@ out:
+@@ -1690,7 +1690,7 @@ static struct dentry *__lookup_hash(struct qstr *name,
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -48,17 +48,11 @@
  {
  	return __lookup_hash(&nd->last, nd->path.dentry, nd);
  }
- 
--static int __lookup_one_len(const char *name, struct qstr *this,
-+int __lookup_one_len(const char *name, struct qstr *this,
- 		struct dentry *base, int len)
- {
- 	unsigned long hash;
 diff --git a/fs/splice.c b/fs/splice.c
-index 50a5d97..886e942 100644
+index aa866d3..19afec6 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1081,8 +1081,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -69,7 +63,7 @@
  {
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
  				loff_t *, size_t, unsigned int);
-@@ -1109,9 +1109,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1113,9 +1113,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.
   */
@@ -83,16 +77,14 @@
  	ssize_t (*splice_read)(struct file *, loff_t *,
  			       struct pipe_inode_info *, size_t, unsigned int);
 diff --git a/include/linux/namei.h b/include/linux/namei.h
-index f276d4f..4eb5fcb 100644
+index eba45ea..21ed6c9 100644
 --- a/include/linux/namei.h
 +++ b/include/linux/namei.h
-@@ -79,6 +79,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+@@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
  extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
  		int (*open)(struct inode *, struct file *));
  
 +extern struct dentry *lookup_hash(struct nameidata *nd);
-+extern int __lookup_one_len(const char *name, struct qstr *this,
-+			    struct dentry *base, int len);
  extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
  
  extern int follow_down_one(struct path *);
@@ -114,10 +106,10 @@
 aufs2.1 standalone patch for linux-2.6.
 
 diff --git a/fs/file_table.c b/fs/file_table.c
-index eb36b6b..12f2809 100644
+index 01e4c1e..0e800e2 100644
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
-@@ -393,6 +393,8 @@ void file_sb_list_del(struct file *file)
+@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file)
  	}
  }
  
@@ -127,22 +119,22 @@
  
  /*
 diff --git a/fs/inode.c b/fs/inode.c
-index 0647d80..294b8ad 100644
+index 43566d1..4291eae 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -82,6 +82,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);
+@@ -69,6 +69,7 @@ static DEFINE_SPINLOCK(inode_lru_lock);
+ 
+ __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
+ __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_wb_list_lock);
++EXPORT_SYMBOL(inode_sb_list_lock);
  
  /*
-  * iprune_sem provides exclusion between the kswapd or try_to_free_pages
+  * iprune_sem provides exclusion between the icache shrinking and the
 diff --git a/fs/namei.c b/fs/namei.c
-index cd39cdf..db4290c 100644
+index cc5dc02..121d5ba 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -353,6 +353,7 @@ int deny_write_access(struct file * file)
+@@ -365,6 +365,7 @@ int deny_write_access(struct file * file)
  
  	return 0;
  }
@@ -150,27 +142,19 @@
  
  /**
   * path_get - get a reference to a path
-@@ -1845,6 +1846,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1694,6 +1695,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
  {
  	return __lookup_hash(&nd->last, nd->path.dentry, nd);
  }
 +EXPORT_SYMBOL(lookup_hash);
  
- int __lookup_one_len(const char *name, struct qstr *this,
- 		struct dentry *base, int len)
-@@ -1867,6 +1869,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
- 	this->hash = end_name_hash(hash);
- 	return 0;
- }
-+EXPORT_SYMBOL(__lookup_one_len);
- 
  /**
   * lookup_one_len - filesystem helper to lookup single pathname component
 diff --git a/fs/namespace.c b/fs/namespace.c
-index d1edf26..44ca259 100644
+index fe59bd1..7d3843f 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1465,6 +1465,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -204,10 +188,10 @@
  }
 +EXPORT_SYMBOL(fsnotify_alloc_group);
 diff --git a/fs/notify/mark.c b/fs/notify/mark.c
-index 325185e..adede09 100644
+index 252ab1f..2199b9b 100644
 --- a/fs/notify/mark.c
 +++ b/fs/notify/mark.c
-@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
+@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
  	if (atomic_dec_and_test(&mark->refcnt))
  		mark->free_mark(mark);
  }
@@ -215,7 +199,7 @@
  
  /*
   * Any time a mark is getting freed we end up here.
-@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
+@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
  	if (unlikely(atomic_dec_and_test(&group->num_marks)))
  		fsnotify_final_destroy_group(group);
  }
@@ -223,7 +207,7 @@
  
  void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
  {
-@@ -277,6 +279,7 @@ err:
+@@ -276,6 +278,7 @@ err:
  
  	return ret;
  }
@@ -231,7 +215,7 @@
  
  /*
   * 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,
+@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
  	atomic_set(&mark->refcnt, 1);
  	mark->free_mark = free_mark;
  }
@@ -240,7 +224,7 @@
  static int fsnotify_mark_destroy(void *ignored)
  {
 diff --git a/fs/open.c b/fs/open.c
-index 5a2c6eb..f0fa5b2 100644
+index b52cf01..c1b341c 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,
@@ -252,10 +236,10 @@
  static long do_sys_truncate(const char __user *pathname, loff_t length)
  {
 diff --git a/fs/splice.c b/fs/splice.c
-index 886e942..9a77a3e 100644
+index 19afec6..11f07f8 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1105,6 +1105,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -263,7 +247,7 @@
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -1131,6 +1132,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
@@ -272,39 +256,31 @@
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/security/commoncap.c b/security/commoncap.c
-index 64c2ed9..e58b5d8 100644
+index a93b3b7..024282c 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
-@@ -929,3 +929,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
- 	}
+@@ -971,3 +971,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 8d9c48f..29108aa 100644
+index 1be6826..215278c 100644
 --- a/security/device_cgroup.c
 +++ b/security/device_cgroup.c
-@@ -515,6 +515,7 @@ found:
+@@ -508,6 +508,7 @@ found:
  
  	return -EPERM;
  }
-+EXPORT_SYMBOL(devcgroup_inode_permission);
++EXPORT_SYMBOL(__devcgroup_inode_permission);
  
  int devcgroup_inode_mknod(int mode, dev_t dev)
  {
 diff --git a/security/security.c b/security/security.c
-index 7b7308a..140afc7 100644
+index 4ba6d4c..9f64bb8 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -359,6 +359,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
- 		return 0;
- 	return security_ops->path_mkdir(dir, dentry, mode);
- }
-+EXPORT_SYMBOL(security_path_mkdir);
- 
- int security_path_rmdir(struct path *dir, struct dentry *dentry)
- {
-@@ -366,6 +367,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
  		return 0;
  	return security_ops->path_rmdir(dir, dentry);
  }
@@ -312,15 +288,7 @@
  
  int security_path_unlink(struct path *dir, struct dentry *dentry)
  {
-@@ -373,6 +375,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
- 		return 0;
- 	return security_ops->path_unlink(dir, dentry);
- }
-+EXPORT_SYMBOL(security_path_unlink);
- 
- int security_path_symlink(struct path *dir, struct dentry *dentry,
- 			  const char *old_name)
-@@ -381,6 +384,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
  		return 0;
  	return security_ops->path_symlink(dir, dentry, old_name);
  }
@@ -328,7 +296,7 @@
  
  int security_path_link(struct dentry *old_dentry, struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -389,6 +393,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+@@ -397,6 +399,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);
  }
@@ -336,15 +304,7 @@
  
  int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
  			 struct path *new_dir, struct dentry *new_dentry)
-@@ -399,6 +404,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
- 	return security_ops->path_rename(old_dir, old_dentry, new_dir,
- 					 new_dentry);
- }
-+EXPORT_SYMBOL(security_path_rename);
- 
- int security_path_truncate(struct path *path)
- {
-@@ -406,6 +412,7 @@ int security_path_truncate(struct path *path)
+@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path)
  		return 0;
  	return security_ops->path_truncate(path);
  }
@@ -352,7 +312,7 @@
  
  int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
  			mode_t mode)
-@@ -414,6 +421,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
  		return 0;
  	return security_ops->path_chmod(dentry, mnt, mode);
  }
@@ -360,7 +320,7 @@
  
  int security_path_chown(struct path *path, uid_t uid, gid_t gid)
  {
-@@ -421,6 +429,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
  		return 0;
  	return security_ops->path_chown(path, uid, gid);
  }
@@ -368,7 +328,7 @@
  
  int security_path_chroot(struct path *path)
  {
-@@ -497,6 +506,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry)
  		return 0;
  	return security_ops->inode_readlink(dentry);
  }
@@ -376,15 +336,15 @@
  
  int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
-@@ -511,6 +521,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
- 	return security_ops->inode_permission(inode, mask);
+ 	return security_ops->inode_permission(inode, mask, 0);
  }
 +EXPORT_SYMBOL(security_inode_permission);
  
  int security_inode_exec_permission(struct inode *inode, unsigned int flags)
  {
-@@ -619,6 +630,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -626,6 +634,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -392,7 +352,7 @@
  
  int security_file_alloc(struct file *file)
  {
-@@ -646,6 +658,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+@@ -653,6 +662,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
  		return ret;
  	return ima_file_mmap(file, prot);
  }
@@ -402,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	2011-03-21 20:22:06.833934512 +0100
++++ linux/Documentation/ABI/testing/debugfs-aufs	2011-07-11 11:34:24.068331673 +0200
 @@ -0,0 +1,37 @@
 +What:		/debug/aufs/si_<id>/
 +Date:		March 2009
@@ -443,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	2011-03-21 20:22:06.833934512 +0100
++++ linux/Documentation/ABI/testing/sysfs-aufs	2011-07-11 11:34:24.068331673 +0200
 @@ -0,0 +1,24 @@
 +What:		/sys/fs/aufs/si_<id>/
 +Date:		March 2009
@@ -471,8 +431,8 @@
 +		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	2011-03-21 20:22:06.850601942 +0100
-@@ -0,0 +1,61 @@
++++ linux/fs/aufs/aufs.h	2011-07-11 11:34:24.070331673 +0200
+@@ -0,0 +1,60 @@
 +/*
 + * Copyright (C) 2005-2011 Junjiro R. Okajima
 + *
@@ -522,7 +482,6 @@
 +#include "inode.h"
 +#include "loop.h"
 +#include "module.h"
-+/* never include ./mtx.h */
 +#include "opts.h"
 +#include "rwsem.h"
 +#include "spl.h"
@@ -536,7 +495,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	2011-03-21 20:22:06.850601942 +0100
++++ linux/fs/aufs/branch.c	2011-07-11 11:34:24.070331673 +0200
 @@ -0,0 +1,1160 @@
 +/*
 + * Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1700,7 +1659,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	2011-03-21 20:22:06.850601942 +0100
++++ linux/fs/aufs/branch.h	2011-07-11 11:34:24.070331673 +0200
 @@ -0,0 +1,233 @@
 +/*
 + * Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -1937,8 +1896,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	2011-03-21 20:22:06.850601942 +0100
-@@ -0,0 +1,37 @@
++++ linux/fs/aufs/conf.mk	2011-07-11 11:34:24.071331673 +0200
+@@ -0,0 +1,38 @@
 +
 +AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS}
 +
@@ -1953,6 +1912,7 @@
 +	HNOTIFY HFSNOTIFY \
 +	EXPORT INO_T_64 \
 +	RDU \
++	PROC_MAP \
 +	SP_IATTR \
 +	SHWH \
 +	BR_RAMFS \
@@ -1978,7 +1938,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	2011-03-21 20:22:06.850601942 +0100
++++ linux/fs/aufs/cpup.c	2011-07-11 11:34:24.071331673 +0200
 @@ -0,0 +1,1063 @@
 +/*
 + * Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -3045,7 +3005,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	2011-03-21 20:22:06.850601942 +0100
++++ linux/fs/aufs/cpup.h	2011-07-11 11:34:24.071331673 +0200
 @@ -0,0 +1,83 @@
 +/*
 + * Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -3132,7 +3092,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	2011-03-21 20:22:06.850601942 +0100
++++ linux/fs/aufs/dbgaufs.c	2011-07-11 11:34:24.071331673 +0200
 @@ -0,0 +1,334 @@
 +/*
 + * Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -3470,7 +3430,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	2011-03-21 20:22:06.850601942 +0100
++++ linux/fs/aufs/dbgaufs.h	2011-07-11 11:34:24.071331673 +0200
 @@ -0,0 +1,52 @@
 +/*
 + * Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -3526,7 +3486,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	2011-03-21 20:22:06.850601942 +0100
++++ linux/fs/aufs/dcsub.c	2011-07-11 11:34:24.071331673 +0200
 @@ -0,0 +1,243 @@
 +/*
 + * Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -3773,7 +3733,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	2011-03-21 20:22:06.853935428 +0100
++++ linux/fs/aufs/dcsub.h	2011-07-11 11:34:24.071331673 +0200
 @@ -0,0 +1,95 @@
 +/*
 + * Copyright (C) 2005-2011 Junjiro R. Okajima
@@ -3872,8 +3832,8 @@
 +#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	2011-03-21 20:22:06.853935428 +0100
-@@ -0,0 +1,469 @@
++++ linux/fs/aufs/debug.c	2011-07-11 11:34:24.071331673 +0200
+@@ -0,0 +1,479 @@
 +/*
 + * Copyright (C) 2005-2011 Junjiro R. Okajima
 + *
@@ -4009,6 +3969,16 @@
 +			     iinfo->ii_hinode[0 + bindex].hi_whdentry);
 +}
 +
++void au_dpri_dalias(struct inode *inode)
++{
++	struct dentry *d;
++
++	spin_lock(&inode->i_lock);
++	list_for_each_entry(d, &inode->i_dentry, d_alias)
++		au_dpri_dentry(d);
++	spin_unlock(&inode->i_lock);
++}
++
 +static int do_pri_dentry(aufs_bindex_t bindex, struct dentry *dentry)
 +{
 +	struct dentry *wh = NULL;
@@ -4071,7 +4041,7 @@
 +	    && au_test_aufs(file->f_dentry->d_sb)
 +	    && au_fi(file))
 +		snprintf(a, sizeof(a), ", gen %d, mmapped %d",
-+			 au_figen(file), !!au_fi(file)->fi_hvmop);
++			 au_figen(file), atomic_read(&au_fi(file)->fi_mmapped));
 +	dpri("f%d: mode 0x%x, flags 0%o, cnt %ld, v %llu, pos %llu%s\n",
 +	     bindex, file->f_mode, file->f_flags, (long)file_count(file),
 +	     file->f_version, file->f_pos, a);
@@ -4345,8 +4315,8 @@
 +}
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs2-unionfs.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs2.patch?r1=1.20&r2=1.21&f=u



More information about the pld-cvs-commit mailing list