X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-3.3%2F100-overlayfs_v12.patch;h=14e655897b9acd39594d75698f51f215c0d05b96;hb=dd7650f67cdbdec6bc8ada714eeeb366eb70a62f;hp=b7508e6639621e208600dd3566ef62db6cbc8e24;hpb=eca9950f63ec4491a7bd6138174ac08595184e1b;p=oweals%2Fopenwrt.git

diff --git a/target/linux/generic/patches-3.3/100-overlayfs_v12.patch b/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
index b7508e6639..14e655897b 100644
--- a/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
+++ b/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
@@ -244,7 +244,7 @@
  ========================
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -4930,6 +4930,13 @@ F:	drivers/scsi/osd/
+@@ -4955,6 +4955,13 @@ F:	drivers/scsi/osd/
  F:	include/scsi/osd_*
  F:	fs/exofs/
  
@@ -3166,7 +3166,7 @@
 +module_exit(ovl_exit);
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1299,6 +1299,7 @@ long do_splice_direct(struct file *in, l
+@@ -1302,6 +1302,7 @@ long do_splice_direct(struct file *in, l
  
  	return ret;
  }
@@ -3189,7 +3189,7 @@
  /** 
   * enum positive_aop_returns - aop return codes with specific semantics
   *
-@@ -1496,6 +1502,11 @@ struct super_block {
+@@ -1501,6 +1507,11 @@ struct super_block {
  
  	/* Being remounted read-only */
  	int s_readonly_remount;
@@ -3201,7 +3201,7 @@
  };
  
  /* superblock cache pruning functions */
-@@ -1653,6 +1664,8 @@ struct inode_operations {
+@@ -1658,6 +1669,8 @@ struct inode_operations {
  	void (*truncate_range)(struct inode *, loff_t, loff_t);
  	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
  		      u64 len);
@@ -3210,7 +3210,7 @@
  } ____cacheline_aligned;
  
  struct seq_file;
-@@ -2023,6 +2036,7 @@ extern long do_sys_open(int dfd, const c
+@@ -2028,6 +2041,7 @@ extern long do_sys_open(int dfd, const c
  extern struct file *filp_open(const char *, int, umode_t);
  extern struct file *file_open_root(struct dentry *, struct vfsmount *,
  				   const char *, int);