summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.9/100-overlayfs.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-04-09 16:16:20 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-04-09 16:16:20 +0000
commit915969ff2c54f7c3396187dc477f1194362fe784 (patch)
treea9043596d781a6f3a41caee923fe67e035c73fcd /target/linux/generic/patches-3.9/100-overlayfs.patch
parentc3366cd164acfe68405c5fb92ddb8b2a8e8880c1 (diff)
downloadmtk-20170518-915969ff2c54f7c3396187dc477f1194362fe784.zip
mtk-20170518-915969ff2c54f7c3396187dc477f1194362fe784.tar.gz
mtk-20170518-915969ff2c54f7c3396187dc477f1194362fe784.tar.bz2
kernel: refresh patches against 3.9-rc6
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 36297
Diffstat (limited to 'target/linux/generic/patches-3.9/100-overlayfs.patch')
-rw-r--r--target/linux/generic/patches-3.9/100-overlayfs.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.9/100-overlayfs.patch b/target/linux/generic/patches-3.9/100-overlayfs.patch
index a4bb686..ae1f2f3 100644
--- a/target/linux/generic/patches-3.9/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.9/100-overlayfs.patch
@@ -243,7 +243,7 @@
will be called when part or all of the page is to be removed
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -5905,6 +5905,13 @@ F: drivers/scsi/osd/
+@@ -5911,6 +5911,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/
@@ -335,7 +335,7 @@
goto out;
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1399,6 +1399,24 @@ void drop_collected_mounts(struct vfsmou
+@@ -1403,6 +1403,24 @@ void drop_collected_mounts(struct vfsmou
release_mounts(&umount_list);
}
@@ -3118,7 +3118,7 @@
+module_exit(ovl_exit);
--- a/fs/splice.c
+++ b/fs/splice.c
-@@ -1308,6 +1308,7 @@ long do_splice_direct(struct file *in, l
+@@ -1310,6 +1310,7 @@ long do_splice_direct(struct file *in, l
return ret;
}
@@ -3179,7 +3179,7 @@
static inline bool execute_ok(struct inode *inode)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
-@@ -66,6 +66,9 @@ extern void mnt_pin(struct vfsmount *mnt
+@@ -68,6 +68,9 @@ extern void mnt_pin(struct vfsmount *mnt
extern void mnt_unpin(struct vfsmount *mnt);
extern int __mnt_is_readonly(struct vfsmount *mnt);