kernel: backport upstream commit to fix MIPS cache shift with secondary cache enabled

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.14 / 100-overlayfs.patch

diff --git a/target/linux/generic/patches-3.14/100-overlayfs.patch b/target/linux/generic/patches-3.14/100-overlayfs.patch
index 28bd4d89f5dda2235b97adb10eb837194583bc69..bbf23a7a5dcef52a0306b77d230d05435647a50f 100644 (file)
--- a/target/linux/generic/patches-3.14/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.14/100-overlayfs.patch
@@ -279,7 +279,7 @@
  obj-$(CONFIG_OMFS_FS)         += omfs/
 --- a/fs/ecryptfs/main.c
 +++ b/fs/ecryptfs/main.c
-@@ -566,6 +566,13 @@ static struct dentry *ecryptfs_mount(str
+@@ -576,6 +576,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;
@@ -318,7 +318,7 @@
  extern const struct file_operations pipefifo_fops;
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -413,6 +413,7 @@ int __inode_permission(struct inode *ino
+@@ -415,6 +415,7 @@ int __inode_permission(struct inode *ino
  
        return security_inode_permission(inode, mask);
  }
@@ -326,7 +326,7 @@
  
  /**
   * sb_permission - Check superblock-level permissions
-@@ -3035,9 +3036,12 @@ finish_open_created:
+@@ -3037,9 +3038,12 @@ finish_open_created:
        error = may_open(&nd->path, acc_mode, open_flag);
        if (error)
                goto out;
@@ -344,7 +344,7 @@
                goto out;
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1541,6 +1541,33 @@ void drop_collected_mounts(struct vfsmou
+@@ -1586,6 +1586,33 @@ void drop_collected_mounts(struct vfsmou
        namespace_unlock();
  }
  
@@ -3219,7 +3219,7 @@
  file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
 --- a/include/linux/mount.h
 +++ b/include/linux/mount.h
-@@ -74,6 +74,9 @@ extern void mnt_pin(struct vfsmount *mnt
+@@ -81,6 +81,9 @@ extern void mnt_pin(struct vfsmount *mnt
  extern void mnt_unpin(struct vfsmount *mnt);
  extern int __mnt_is_readonly(struct vfsmount *mnt);