bump to new major .32 series

2 files changed, 19 insertions, 19 deletions

diff --git a/patches/aufs2-base-20090910.patch b/patches/aufs2-base-20091203.patch
index f8a34eb..87980d2 100644
--- a/patches/aufs2-base-20090910.patch
+++ b/patches/aufs2-base-20091203.patch
@@ -1,7 +1,7 @@
 aufs2 base patch for linux-2.6.
 
 diff --git a/fs/namei.c b/fs/namei.c
-index f3c5b27..dcedad1 100644
+index d11f404..7d28f56 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
 @@ -1219,7 +1219,7 @@ out:
@@ -23,10 +23,10 @@ index f3c5b27..dcedad1 100644
  {
  	unsigned long hash;
 diff --git a/fs/splice.c b/fs/splice.c
-index 73766d2..0cb8873 100644
+index 7394e9e..77184f0 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1057,8 +1057,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1051,8 +1051,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -37,7 +37,7 @@ index 73766d2..0cb8873 100644
  {
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
  				loff_t *, size_t, unsigned int);
-@@ -1084,9 +1084,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1078,9 +1078,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.
   */
@@ -51,7 +51,7 @@ index 73766d2..0cb8873 100644
  	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 d870ae2..a49900e 100644
+index ec0f607..1438153 100644
 --- a/include/linux/namei.h
 +++ b/include/linux/namei.h
 @@ -75,6 +75,9 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry
diff --git a/patches/aufs2-standalone-20090910.patch b/patches/aufs2-standalone-20091203.patch
index 9461775..a87d55d 100644
--- a/patches/aufs2-standalone-20090910.patch
+++ b/patches/aufs2-standalone-20091203.patch
@@ -1,10 +1,10 @@
 aufs2 standalone patch for linux-2.6.
 
 diff --git a/fs/namei.c b/fs/namei.c
-index dcedad1..728a39b 100644
+index 7d28f56..0f6117c 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -337,6 +337,7 @@ int deny_write_access(struct file * file)
+@@ -350,6 +350,7 @@ int deny_write_access(struct file * file)
  
  	return 0;
  }
@@ -29,7 +29,7 @@ index dcedad1..728a39b 100644
  /**
   * lookup_one_len - filesystem helper to lookup single pathname component
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 7230787..8269b66 100644
+index bdc3cb4..a2cadcf 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -39,6 +39,7 @@
@@ -41,22 +41,22 @@ index 7230787..8269b66 100644
  static int event;
  static DEFINE_IDA(mnt_id_ida);
 diff --git a/fs/open.c b/fs/open.c
-index dd98e80..04b9aad 100644
+index 4f01e06..ef09031 100644
 --- a/fs/open.c
 +++ b/fs/open.c
-@@ -221,6 +221,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+@@ -223,6 +223,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
  	mutex_unlock(&dentry->d_inode->i_mutex);
- 	return err;
+ 	return ret;
  }
 +EXPORT_SYMBOL(do_truncate);
  
  static long do_sys_truncate(const char __user *pathname, loff_t length)
  {
 diff --git a/fs/splice.c b/fs/splice.c
-index 0cb8873..0e7b0b9 100644
+index 77184f0..8479d95 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1080,6 +1080,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1074,6 +1074,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -64,7 +64,7 @@ index 0cb8873..0e7b0b9 100644
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -1105,6 +1106,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1099,6 +1100,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
  	return splice_read(in, ppos, pipe, len, flags);
  }
@@ -73,10 +73,10 @@ index 0cb8873..0e7b0b9 100644
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/security/device_cgroup.c b/security/device_cgroup.c
-index b8186ba..42208d8 100644
+index 6cf8fd2..008e0d8 100644
 --- a/security/device_cgroup.c
 +++ b/security/device_cgroup.c
-@@ -513,6 +513,7 @@ found:
+@@ -514,6 +514,7 @@ found:
  
  	return -EPERM;
  }
@@ -85,10 +85,10 @@ index b8186ba..42208d8 100644
  int devcgroup_inode_mknod(int mode, dev_t dev)
  {
 diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
-index 4732f5e..6fa13dd 100644
+index b85e61b..a23fad4 100644
 --- a/security/integrity/ima/ima_main.c
 +++ b/security/integrity/ima/ima_main.c
-@@ -320,6 +320,7 @@ int ima_file_mmap(struct file *file, unsigned long prot)
+@@ -324,6 +324,7 @@ int ima_file_mmap(struct file *file, unsigned long prot)
  					 MAY_EXEC, FILE_MMAP);
  	return 0;
  }
@@ -97,7 +97,7 @@ index 4732f5e..6fa13dd 100644
  /**
   * ima_bprm_check - based on policy, collect/store measurement.
 diff --git a/security/security.c b/security/security.c
-index dc7674f..b309f88 100644
+index c4c6732..854d15c 100644
 --- a/security/security.c
 +++ b/security/security.c
 @@ -386,6 +386,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode)