diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-03-31 13:43:06 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-03-31 13:43:06 +0000 |
| commit | 36fefbb60e17cf2978b5ea0f954ef992e02c9ca3 (patch) | |
| tree | 2998c2a4ed3532a1d01bbbbf97d0b185d74016ac /target/linux/generic/patches-3.14/100-overlayfs.patch | |
| parent | a22190340a3b25ce385b89bdcee4c8a7c1e91223 (diff) | |
| download | upstream-36fefbb60e17cf2978b5ea0f954ef992e02c9ca3.tar.gz upstream-36fefbb60e17cf2978b5ea0f954ef992e02c9ca3.tar.bz2 upstream-36fefbb60e17cf2978b5ea0f954ef992e02c9ca3.zip | |
3.14 final is out
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 40352
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 5a7150db86..9007c96deb 100644 --- a/target/linux/generic/patches-3.14/100-overlayfs.patch +++ b/target/linux/generic/patches-3.14/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 -@@ -6451,6 +6451,13 @@ F: drivers/scsi/osd/ +@@ -6452,6 +6452,13 @@ F: drivers/scsi/osd/ F: include/scsi/osd_* F: fs/exofs/ @@ -326,7 +326,7 @@ /** * sb_permission - Check superblock-level permissions -@@ -3038,9 +3039,12 @@ finish_open_created: +@@ -3035,9 +3036,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 -@@ -1495,6 +1495,33 @@ void drop_collected_mounts(struct vfsmou +@@ -1541,6 +1541,33 @@ void drop_collected_mounts(struct vfsmou namespace_unlock(); } |