diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-10-24 20:39:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-24 20:39:36 +0000 |
| commit | 951113224ea6b34413c62aaee700437b55105b14 (patch) | |
| tree | 0be68d8418752f584e77c1f034904a46bc24f185 /target/linux/generic/patches-3.10/100-overlayfs.patch | |
| parent | 6ba296a1c9439ca825180e078d1190b2149547cc (diff) | |
| download | master-187ad058-951113224ea6b34413c62aaee700437b55105b14.tar.gz master-187ad058-951113224ea6b34413c62aaee700437b55105b14.tar.bz2 master-187ad058-951113224ea6b34413c62aaee700437b55105b14.zip | |
kernel: refresh generic 3.10 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43050 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/100-overlayfs.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/100-overlayfs.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.10/100-overlayfs.patch b/target/linux/generic/patches-3.10/100-overlayfs.patch index 40e4a65870..47da90bcc3 100644 --- a/target/linux/generic/patches-3.10/100-overlayfs.patch +++ b/target/linux/generic/patches-3.10/100-overlayfs.patch @@ -322,7 +322,7 @@ extern const struct file_operations pipefifo_fops; --- a/fs/namei.c +++ b/fs/namei.c -@@ -403,6 +403,7 @@ int __inode_permission(struct inode *ino +@@ -404,6 +404,7 @@ int __inode_permission(struct inode *ino return security_inode_permission(inode, mask); } @@ -348,7 +348,7 @@ goto out; --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1442,6 +1442,33 @@ void drop_collected_mounts(struct vfsmou +@@ -1455,6 +1455,33 @@ void drop_collected_mounts(struct vfsmou namespace_unlock(); } @@ -3220,7 +3220,7 @@ file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); --- a/include/linux/mount.h +++ b/include/linux/mount.h -@@ -68,6 +68,9 @@ extern void mnt_pin(struct vfsmount *mnt +@@ -75,6 +75,9 @@ extern void mnt_pin(struct vfsmount *mnt extern void mnt_unpin(struct vfsmount *mnt); extern int __mnt_is_readonly(struct vfsmount *mnt); |