update to latest major release 2.6.35

2 files changed, 36 insertions, 36 deletions

diff --git a/patches/aufs2-base-20100517.patch b/patches/aufs2-base-20100802.patch
index 9f02505..e190f87 100644
--- a/patches/aufs2-base-20100517.patch
+++ b/patches/aufs2-base-20100802.patch
@@ -1,10 +1,10 @@
 aufs2 base patch for linux-2.6.
 
 diff --git a/fs/namei.c b/fs/namei.c
-index a7dce91..c345520 100644
+index 868d0cb..6e92c81 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -1177,7 +1177,7 @@ out:
+@@ -1178,7 +1178,7 @@ out:
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -13,7 +13,7 @@ index a7dce91..c345520 100644
  {
  	int err;
  
-@@ -1187,7 +1187,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1188,7 +1188,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
  	return __lookup_hash(&nd->last, nd->path.dentry, nd);
  }
  
@@ -23,10 +23,10 @@ index a7dce91..c345520 100644
  {
  	unsigned long hash;
 diff --git a/fs/splice.c b/fs/splice.c
-index 9313b61..b9e871f 100644
+index efdbfec..e01a51e 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1054,8 +1054,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1104,8 +1104,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -37,7 +37,7 @@ index 9313b61..b9e871f 100644
  {
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
  				loff_t *, size_t, unsigned int);
-@@ -1082,9 +1082,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1132,9 +1132,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.
   */
@@ -65,12 +65,12 @@ index 05b441d..91bc74e 100644
  
  extern int follow_down(struct path *);
 diff --git a/include/linux/splice.h b/include/linux/splice.h
-index 18e7c7c..8393b5c 100644
+index 997c3b4..be9a153 100644
 --- a/include/linux/splice.h
 +++ b/include/linux/splice.h
-@@ -82,4 +82,10 @@ extern ssize_t splice_to_pipe(struct pipe_inode_info *,
- extern ssize_t splice_direct_to_actor(struct file *, struct splice_desc *,
- 				      splice_direct_actor *);
+@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
+ extern void splice_shrink_spd(struct pipe_inode_info *,
+ 				struct splice_pipe_desc *);
  
 +extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 +			   loff_t *ppos, size_t len, unsigned int flags);
diff --git a/patches/aufs2-standalone-20100517.patch b/patches/aufs2-standalone-20100802.patch
index ba5922a..631d981 100644
--- a/patches/aufs2-standalone-20100517.patch
+++ b/patches/aufs2-standalone-20100802.patch
@@ -1,7 +1,7 @@
 aufs2 standalone patch for linux-2.6.
 
 diff --git a/fs/namei.c b/fs/namei.c
-index c345520..b4e15a2 100644
+index 6e92c81..334130e 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
 @@ -348,6 +348,7 @@ int deny_write_access(struct file * file)
@@ -12,7 +12,7 @@ index c345520..b4e15a2 100644
  
  /**
   * path_get - get a reference to a path
-@@ -1186,6 +1187,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+@@ -1187,6 +1188,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
  		return ERR_PTR(err);
  	return __lookup_hash(&nd->last, nd->path.dentry, nd);
  }
@@ -20,7 +20,7 @@ index c345520..b4e15a2 100644
  
  int __lookup_one_len(const char *name, struct qstr *this,
  		struct dentry *base, int len)
-@@ -1208,6 +1210,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
+@@ -1209,6 +1211,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
  	this->hash = end_name_hash(hash);
  	return 0;
  }
@@ -29,10 +29,10 @@ index c345520..b4e15a2 100644
  /**
   * lookup_one_len - filesystem helper to lookup single pathname component
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 8174c8a..9b90f70 100644
+index 88058de..397afcc 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1282,6 +1282,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1279,6 +1279,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -110,10 +110,10 @@ index 0399bcb..74cdc13 100644
  /**
   * fsnotify_unmount_inodes - an sb is unmounting.  handle any watched inodes.
 diff --git a/fs/open.c b/fs/open.c
-index 74e5cd9..8192b46 100644
+index 5463266..d248ead 100644
 --- a/fs/open.c
 +++ b/fs/open.c
-@@ -225,6 +225,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+@@ -59,6 +59,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
  	mutex_unlock(&dentry->d_inode->i_mutex);
  	return ret;
  }
@@ -122,10 +122,10 @@ index 74e5cd9..8192b46 100644
  static long do_sys_truncate(const char __user *pathname, loff_t length)
  {
 diff --git a/fs/splice.c b/fs/splice.c
-index b9e871f..b069be4 100644
+index e01a51e..4806358 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1078,6 +1078,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1128,6 +1128,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -133,7 +133,7 @@ index b9e871f..b069be4 100644
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -1104,6 +1105,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1154,6 +1155,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
@@ -142,7 +142,7 @@ index b9e871f..b069be4 100644
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/security/commoncap.c b/security/commoncap.c
-index 6166973..a702444 100644
+index 4e01599..3611e1b 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
 @@ -951,3 +951,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
@@ -151,7 +151,7 @@ index 6166973..a702444 100644
  }
 +EXPORT_SYMBOL(cap_file_mmap);
 diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index f77c604..743f39b 100644
+index 8d9c48f..29108aa 100644
 --- a/security/device_cgroup.c
 +++ b/security/device_cgroup.c
 @@ -515,6 +515,7 @@ found:
@@ -163,10 +163,10 @@ index f77c604..743f39b 100644
  int devcgroup_inode_mknod(int mode, dev_t dev)
  {
 diff --git a/security/security.c b/security/security.c
-index 687c6fd..e9e5f6b 100644
+index 351942a..6ba84a8 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -411,6 +411,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
+@@ -376,6 +376,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
  		return 0;
  	return security_ops->path_mkdir(dir, dentry, mode);
  }
@@ -174,7 +174,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_path_rmdir(struct path *dir, struct dentry *dentry)
  {
-@@ -418,6 +419,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+@@ -383,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
  		return 0;
  	return security_ops->path_rmdir(dir, dentry);
  }
@@ -182,7 +182,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_path_unlink(struct path *dir, struct dentry *dentry)
  {
-@@ -425,6 +427,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
+@@ -390,6 +392,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
  		return 0;
  	return security_ops->path_unlink(dir, dentry);
  }
@@ -190,7 +190,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_path_symlink(struct path *dir, struct dentry *dentry,
  			  const char *old_name)
-@@ -433,6 +436,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+@@ -398,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
  		return 0;
  	return security_ops->path_symlink(dir, dentry, old_name);
  }
@@ -198,7 +198,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_path_link(struct dentry *old_dentry, struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -441,6 +445,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+@@ -406,6 +410,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);
  }
@@ -206,7 +206,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
  			 struct path *new_dir, struct dentry *new_dentry)
-@@ -451,6 +456,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+@@ -416,6 +421,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);
  }
@@ -214,7 +214,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_path_truncate(struct path *path, loff_t length,
  			   unsigned int time_attrs)
-@@ -459,6 +465,7 @@ int security_path_truncate(struct path *path, loff_t length,
+@@ -424,6 +430,7 @@ int security_path_truncate(struct path *path, loff_t length,
  		return 0;
  	return security_ops->path_truncate(path, length, time_attrs);
  }
@@ -222,7 +222,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
  			mode_t mode)
-@@ -467,6 +474,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+@@ -432,6 +439,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
  		return 0;
  	return security_ops->path_chmod(dentry, mnt, mode);
  }
@@ -230,7 +230,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_path_chown(struct path *path, uid_t uid, gid_t gid)
  {
-@@ -474,6 +482,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)
  		return 0;
  	return security_ops->path_chown(path, uid, gid);
  }
@@ -238,7 +238,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_path_chroot(struct path *path)
  {
-@@ -550,6 +559,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -515,6 +524,7 @@ int security_inode_readlink(struct dentry *dentry)
  		return 0;
  	return security_ops->inode_readlink(dentry);
  }
@@ -246,7 +246,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
-@@ -564,6 +574,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -529,6 +539,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
  	return security_ops->inode_permission(inode, mask);
  }
@@ -254,7 +254,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -664,6 +675,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -622,6 +633,7 @@ int security_file_permission(struct file *file, int mask)
  {
  	return security_ops->file_permission(file, mask);
  }
@@ -262,7 +262,7 @@ index 687c6fd..e9e5f6b 100644
  
  int security_file_alloc(struct file *file)
  {
-@@ -691,6 +703,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+@@ -649,6 +661,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
  		return ret;
  	return ima_file_mmap(file, prot);
  }