X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b460d9e23fe468d9d59394ea86f631150006ff6c..a82d9221c9ccfe1260a62fe816ca24625b0b9a7a:/target/linux/generic/patches-3.1/100-overlayfs_v11.patch?ds=inline

diff --git a/target/linux/generic/patches-3.1/100-overlayfs_v11.patch b/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
index 0d6484c9a..9870000d3 100644
--- a/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
+++ b/target/linux/generic/patches-3.1/100-overlayfs_v11.patch
@@ -202,7 +202,7 @@
 +a crash or deadlock.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -4783,6 +4783,13 @@ F:	drivers/scsi/osd/
+@@ -4792,6 +4792,13 @@ F:	drivers/scsi/osd/
  F:	include/scsi/osd_*
  F:	fs/exofs/
  
@@ -238,7 +238,7 @@
  obj-$(CONFIG_OMFS_FS)		+= omfs/
 --- a/fs/ecryptfs/main.c
 +++ b/fs/ecryptfs/main.c
-@@ -525,6 +525,13 @@ static struct dentry *ecryptfs_mount(str
+@@ -544,6 +544,13 @@ static struct dentry *ecryptfs_mount(str
  	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
  	s->s_blocksize = path.dentry->d_sb->s_blocksize;
  	s->s_magic = ECRYPTFS_SUPER_MAGIC;
@@ -254,7 +254,7 @@
  	rc = PTR_ERR(inode);
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1494,6 +1494,23 @@ void drop_collected_mounts(struct vfsmou
+@@ -1495,6 +1495,23 @@ void drop_collected_mounts(struct vfsmou
  	release_mounts(&umount_list);
  }
  
@@ -3121,7 +3121,7 @@
  			       struct pipe_inode_info *opipe,
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -483,6 +483,12 @@ struct iattr {
+@@ -481,6 +481,12 @@ struct iattr {
   */
  #include <linux/quota.h>
  
@@ -3134,7 +3134,7 @@
  /** 
   * enum positive_aop_returns - aop return codes with specific semantics
   *
-@@ -1463,6 +1469,11 @@ struct super_block {
+@@ -1461,6 +1467,11 @@ struct super_block {
  	int cleancache_poolid;
  
  	struct shrinker s_shrink;	/* per-sb shrinker handle */
@@ -3146,7 +3146,7 @@
  };
  
  /* superblock cache pruning functions */
-@@ -1620,6 +1631,7 @@ struct inode_operations {
+@@ -1618,6 +1629,7 @@ struct inode_operations {
  	void (*truncate_range)(struct inode *, loff_t, loff_t);
  	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
  		      u64 len);
@@ -3154,7 +3154,7 @@
  } ____cacheline_aligned;
  
  struct seq_file;
-@@ -2024,6 +2036,7 @@ extern long do_sys_open(int dfd, const c
+@@ -2022,6 +2034,7 @@ extern long do_sys_open(int dfd, const c
  extern struct file *filp_open(const char *, int, int);
  extern struct file *file_open_root(struct dentry *, struct vfsmount *,
  				   const char *, int);