diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-11-29 10:30:58 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-11-29 10:30:58 +0000 |
| commit | 070d3b27c223f23a4793667264441f8c2f008755 (patch) | |
| tree | 70118ffb38f5c0d059605e8a15e6edee87d21d22 /target/linux/generic/patches-3.14/100-overlayfs.patch | |
| parent | d11aefc8eb1faf362ac35712d8a1741768534580 (diff) | |
| download | upstream-070d3b27c223f23a4793667264441f8c2f008755.tar.gz upstream-070d3b27c223f23a4793667264441f8c2f008755.tar.bz2 upstream-070d3b27c223f23a4793667264441f8c2f008755.zip | |
kernel: update 3.14 to 3.14.25
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 43427
Diffstat (limited to 'target/linux/generic/patches-3.14/100-overlayfs.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/100-overlayfs.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.14/100-overlayfs.patch b/target/linux/generic/patches-3.14/100-overlayfs.patch index 45cdd50205..a04b1fefca 100644 --- a/target/linux/generic/patches-3.14/100-overlayfs.patch +++ b/target/linux/generic/patches-3.14/100-overlayfs.patch @@ -318,7 +318,7 @@ extern const struct file_operations pipefifo_fops; --- a/fs/namei.c +++ b/fs/namei.c -@@ -414,6 +414,7 @@ int __inode_permission(struct inode *ino +@@ -415,6 +415,7 @@ int __inode_permission(struct inode *ino return security_inode_permission(inode, mask); } @@ -344,7 +344,7 @@ goto out; --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1541,6 +1541,33 @@ void drop_collected_mounts(struct vfsmou +@@ -1581,6 +1581,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); |