sys-kernel/aufs-sources: Add fix for aufs3 patch incompatibility

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 106 insertions, 19 deletions

diff --git a/sys-kernel/aufs-sources/ChangeLog b/sys-kernel/aufs-sources/ChangeLog
index 027a50e5ffe7..dbc885f5a2be 100644
--- a/sys-kernel/aufs-sources/ChangeLog
+++ b/sys-kernel/aufs-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/aufs-sources
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.82 2014/01/13 07:38:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/ChangeLog,v 1.83 2014/01/14 16:49:53 jlec Exp $
+
+  14 Jan 2014; Justin Lecher <jlec@gentoo.org> aufs-sources-3.10.26.ebuild,
+  aufs-sources-3.12.7.ebuild, +files/aufs-sources-3.10.26-mmap-aufs3.patch,
+  +files/aufs-sources-3.12.7-mmap-aufs3.patch:
+  Add fix for aufs3 patch incompatibility
 
   13 Jan 2014; Justin Lecher <jlec@gentoo.org> aufs-sources-3.10.26.ebuild,
   aufs-sources-3.12.7.ebuild, -files/aufs-sources-3.8.8-CONFIG_USER_NS.patch:
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 799e864da413..1f0f1b88b9b1 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX aufs-sources-3.10.26-mmap-aufs3.patch 1176 SHA256 f1a37d0d6257e04ccd7a71465e471a070c818e07757f1d3ba5f0562f627e9110 SHA512 e7c5e009a188bad5217bc6792b352f21e890ca4dbfbcf3c3cb5c539eb18b8456511cdb3dbe912a1c1343721361f1f6ff001b7a1de8c29f0c346a0cf3433210ae WHIRLPOOL 4f89a55012193eba129d532e029e2412d0fc912e3144994fee10231db15b7fb84d3c1b1066b20297ad1457e0599c6d3236a2d05f2015374e58b0e3b9d3658b4b
+AUX aufs-sources-3.12.7-mmap-aufs3.patch 1176 SHA256 1161c8d0ec37bfacea451a5636d1e5104db0c6d477418e5e09c91dd18a1f5c5d SHA512 a1c97d9b69210d1c91de0f8758db570da4efb6ac97cab4b3c15786914f7241ad9352b15c6f9feceb3524f95aa5a6d726bd3836757f0c8fa14372792f9bb3652d WHIRLPOOL c3d530941fafe2a1d418706bf9517c9da7d29f69056403a5b9689ed13faef3a7b170afb49b83d26e5db83291e598ee277414daab8a9295ee25645e649d4b50d8
 DIST aufs-sources-3.10_p20131007.tar.xz 150600 SHA256 7f8866e1f602602d1214d959e60eb7739448901fdd000b492a1b52101253081a SHA512 1279d447f3f0efc57fb360217d42add4706e25f9f67f6ad93cf097869cf57d847a2fbaba3c983492de1cdd64b503d35e4866b4b31cb65c32e0ea80781e547d22 WHIRLPOOL 4b99254b4cf8d4c0ed950b0abe6f22581eb9e4f77af1ca472bd96515043cbbc4c2e328fc99f6768eae3b8126345a4809a14e65b8d0f2cababa3cd77a433bfc27
 DIST aufs-sources-3.10_p20131111.tar.xz 151456 SHA256 a5229c12e9cf62a04bc84458df88d4fdb3c4e30e38c184cd2e236b22efe01e6f SHA512 421ac913b40c66dab4ca01da1c08204d1ed78a93e4dba09795f0a081a1af5c30bd82863fafdd034defb840b7961e49713242549c2bbe4d8bddc4c81663b27ff0 WHIRLPOOL c215c4ca78409efe48dea1cae373b645452d16ee8711a00913b52c4796756e90960e3d4a61c0a2b1ddf693aee3e206401f6bf648f0d5af0404cda710ee3d8339
 DIST aufs-sources-3.10_p20140114.tar.xz 151480 SHA256 2ca86e6b1f0f531086bee0a6cfe34d5a38d7c1eb02829d49d15ee141e869c2df SHA512 54fd27a140d7f588410de202f594cd88589deac8575798ae67630181ec8203ae0f784d0f7c2e921c8fa0a7a62d5562b1b8a21804d653e612c4b27eca7ea88e79 WHIRLPOOL 9505f9c9b5a73f90f00edd7f11dc5dc728bef93a1b3da423153893f456ccec71b237ea5eec2e53f15c2e760b852025ef432a6d299dc77bde7eccfad1368fb6fe
@@ -56,30 +58,30 @@ EBUILD aufs-sources-3.10.17.ebuild 2253 SHA256 80e49dff5d03446a2466048e50fe97f9a
 EBUILD aufs-sources-3.10.22.ebuild 2040 SHA256 9c6698c85adb10ff70fe621cc6f1f1acef1273b7a918094c6feebb486e506e15 SHA512 3ba62e6931c5c8db3bb6201f7e27e02bf47e23e8ee51cfa622d66d72dff977c64d3b39003ec80b801afb8fcaa9ac72bef951e0579d25bdaf508978362e0ecfbd WHIRLPOOL c3028a588b7cb2f6ddfdc9e2a3fced9a0d4e0a725c5f9e0fc7aa08b1dffcfabca53fcaf6ca13b2c676d377e6aed9448325ae8a6f0dc21eccf59f2930c19f244f
 EBUILD aufs-sources-3.10.24.ebuild 2040 SHA256 b25b319450924ba21ea98fcecec8ce8c26126ebfc3e7dc4c2b14be626ea48aab SHA512 862c0ab90cc12a18f49a8ec85a27de633510ae9640416a04cef245c79ec4cca0e393deed0c902fb73825de394e022c1b2b879b04eef892776f0394f79b20c9d2 WHIRLPOOL 7aeda74ff255a9b184da24464d9de4f30c2a7aecb83f2f324722385a5de89a58c8c10951fb0be50d311ba03b5bc849815c62e2c0d2867d251319d2d00ad9cf85
 EBUILD aufs-sources-3.10.25.ebuild 2040 SHA256 0df64ad91d73076f7b687645a424f0ad73481142ee2c8dfdabdf6d516c1132ea SHA512 23254a2b1979d41570ab62bcabe89dae839601ed2440722ca8a1407031c3426f9d6e5e1bfed4028bd5a0cc70c80460ce2e240f26d2fa3dbeb63f0d7ee92c4f92 WHIRLPOOL 0b10dfa9a19a1ee13c793284b4d18f81642739e5fa4834f3f3fe38d3cf472e8704e96a7ebe144747e1c79ce0e854391a90a7894ba825e231bdba12494ac5c9da
-EBUILD aufs-sources-3.10.26.ebuild 2063 SHA256 4f594b17cfbc380a04eea94c324b56c7b9e8b6e7f8a0b5d2e8814c6e41c55818 SHA512 67021a02c3522560269946cfe1f30ea32725ae71e6e03639c75f704a3d47ad41ac740a3e5ba436713bcafbad73401b6fcc051f8850ac53387b19da9320a4165b WHIRLPOOL 735f701091289af42e72c08322ce10154f179760a4ad84be0a7704c0660a434036b856735da86025a977c54ac892e4fc53fcd5e4647fea8174964ea9f1ba4d99
+EBUILD aufs-sources-3.10.26.ebuild 2108 SHA256 5edbf8271c0926272990ab54eb5fb918a624e1b21de9ff72d61300371de29438 SHA512 a92d238991a2b04d9687216a56974e46e7be45121c7465f8a7aac512dd615ed12e04e432f8163cd4a8ecc4a75a7849a43be59e5218ebd99e8cda448b1d925dd0 WHIRLPOOL a60aa843d6b4b74ac196f6797c655b8985ddb73eee25480b063cc57fb589160f0394cb9d405b427b91f3cc77723e2dff4077ddf63c18c259b96c87def7480ac1
 EBUILD aufs-sources-3.11.10.ebuild 2040 SHA256 16dd64635e525459533371ad60fb23c4c4b865024c6792b6c429d32cb2192bc6 SHA512 738f81d72afc0965066bbec19742a6f099731c91de44ea046dd586c45b477f9fc86f25bc7303b05c88fbf61126c88ecbeba9543aaef074e848b0f20a32895df6 WHIRLPOOL 2dfbb9663c76ab62367dc006061edf23fc34751585093d46bd83c19a6217d04a7011b2d4b4bbb80e6db46f1232ef4a7afc431a4ad00edad962614e07eeec489c
 EBUILD aufs-sources-3.11.8.ebuild 2039 SHA256 798895542ba010f247edac5762aad504e1035f11c9aff71e57be2b97c2071f7f SHA512 c042820f29382f7c73fb9c227f4695f354dbda80f4d4b391c8b807c779acf0991c8790b728ea4654be9766d6392428482954206a652a51541077ff93fa3010fd WHIRLPOOL 148ed35eb3cae5670b31288ec2b7c80eeabc3a65250ee9a5a3dc6d0a5e86ca52424cb4a1e25422a629f1ee38ea9ed936df8c14f8602750688a862dcd86e5e876
 EBUILD aufs-sources-3.11.9.ebuild 2039 SHA256 e5d86bd2e9c0006e947920f93c50a8ff2e27b7b0d2688a7add9f157df3d0dca1 SHA512 7e939bd57c3b988bcecd91266e8319a7784ee7e3281d0018158194942f90b4399c558bed628754ecb561f7e935ae297c8c5f3db2b29f5f188a696aa547772ef8 WHIRLPOOL ec6c924a04b81fac1e9b0456213ce2fc646bc4ea3a768ae876c75bde06ab16699784bbd1e4143396969fd1257e9f226a9014d783b5e6b779c30bc753abf93550
 EBUILD aufs-sources-3.12.4.ebuild 2038 SHA256 04d74558bea43da17fb006cd2b3e990fbbc364fbdb117b190fd530ec10293322 SHA512 7214436dc076530ba5a310ab3d9ac1a7db6b9f0ea894c5f9826e41c4fb683f129c7880d2ed882282676745308ff7f7e63aae8de9f4ccaf7296a67bcfa61cd647 WHIRLPOOL d0630846c33c35eb9615b82ae44bed09f9359a00896029e7602d8f450bce0c1ebab7d4d79ef15c8025e20acbd49489f7154988ccbd737d33fca436c46a9a946a
 EBUILD aufs-sources-3.12.5.ebuild 2038 SHA256 739588ae5cf9e3ec75721cc9d14d62cd8fbc0560b18a170963e97ecb5e3233fc SHA512 239e3998a25ee1cff69aefd21237100f5605e876183c39309e5ac61a54eed75c322c0fff2af90f50cde4b4c7064ea81dae431328f5772aabbfb9865620571761 WHIRLPOOL 4555392a797f9eb9a558ca0d2715e53b7a25be41692a80911ac3e0b81426ffd2942554a4104d5a633f5156115bfe7aa810a70b6a068e19b758b226a02327c620
 EBUILD aufs-sources-3.12.6.ebuild 2038 SHA256 8c67fc9cc4ace8b5dfdccef0144a9a8462ab8eedab50da0eddc58ea594047224 SHA512 f3f009a01cb441b32733762a3c3bdc819570ef0e04b214f57c1562bed73c3b1f0736fb8921af4f695b7ba697ed14e47771814bf6d71c7370b936fa60dfe2c66e WHIRLPOOL b93af8d8178b7fe58ec4f614e06c00c1c125df8a5b9f1d05da6514daa71bf02e4337b63e78e46de0bcc4a265af125804f3fc1f2119731aea7531d6d94247708c
-EBUILD aufs-sources-3.12.7.ebuild 2061 SHA256 0323b5b77bafb90c337d0b5c5c6c56b307bbf36fb223c0181033706d04adf426 SHA512 4f924ae2f7854752f8a87e139a2203b0164ec2d12a9c8fa04c17e19bb041614a9bdbf952afb6e28730ca89cf0ba86ad627f9d3bc3fa551734f80ce00b1772148 WHIRLPOOL 0fa6a3f05c540d533a087b7e7d6d8e65aa14df0622b0dc607e3b928fe246595427a4c76a3ef1687a0ad296481a80a871de7a14ef44db9d949a2ee586a93b3bee
-MISC ChangeLog 20597 SHA256 d51f149cee4da22515116b84130cfe88c5774f889d20ecb85b588bebc8665e38 SHA512 0a11a8978f9d899b2bfdb9a0d45f2d62b28b9972aba4e5872f66b2a68aeecd69a88678b4c4f69c1d065bc541fdf250e50bfe12139b7066d184cf98a3d66daf49 WHIRLPOOL 7a6aa47e031e76770318cd56597da9f63dfb4cd5c18ce0dffc895e4fc5e4f5ac73d1f8eaa655bd7654d3ebb81b61cdbd8f77b37fb543e3cae99c973124a33ee4
+EBUILD aufs-sources-3.12.7.ebuild 2106 SHA256 cc56fa79dabfe3fd845c32b545b9748a6f7905378eb6d494cc74e3d3c14eb3ac SHA512 7a05d8115c41b223189b28492d001ca8c15964422ab26fd01bd045de9de487ce26f3277cfe611b625952361a7e06526e66bee06193601fef343c17ea489ea70f WHIRLPOOL 7358b3a350a28911b7f97d170270b118fd0eee58c8ebbb09e43bd1c3e40206f8cb11b1d2475249ba9c384e399b5c488901d2e1360e8e91a5cf4d72e5c720b765
+MISC ChangeLog 20839 SHA256 5410ad3ed89a29b00a5fa55c594d424b7c7e044e6bbae8b019f39e216b2b7ad4 SHA512 71fe709e1db50d913807f5722c9a2c923bd7bff8127310da6d565cc3115f69fa89ed013e78df6f26dcd4dbbbe007ae7e08e8c4c75cb334474916f45331d090f3 WHIRLPOOL 38ae61e17b851d26b665cb5c77ae2ab57161a00c8594064211cc75ec4aa736f502e56caadbeee4955a7e0ce839d8d55e11cd83ed05a8ca8a702c4f12cb2b4241
 MISC metadata.xml 885 SHA256 5acf9548599fe3a63b03817d0118ec3171679786c3f9c87f712970386bc6f6c4 SHA512 d1fae97e38931edc901683787ec9f9fd7c5809d01a2096f2a156e3e7c919f8efe63abee64be500d9cedf2b5900063f152e91a0ddec2b8af51afd09dea677170b WHIRLPOOL e96cd0e40cfb0d5b9a4b43c309f905255ea61274a6dbfe96f6f6ff643bbca28df1e13cff4077c7b19ccfdea959bc8de53ad07100ba4c3282dcb612e06b864970
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS05f8AAoJELnU8jG9FVirAu0P/2lMpbEYLcru8sqGuTjVC5UG
-/NqA8CjQXgZVg3BvC/iwygCVOsXSYXYfmb294WU/iEbB51aLLSx0am8Voy0FVT+s
-AVPG5ImYKSUUSRmeUY6zkAmtrnAKgIfnruPoH7oSIbgPfOsTcp7z0Oc25rxhy0fy
-8jT/LV5tsDF4pL878Z2rKQD1qQ0ie+O0NMY6u8dBA9cPqGRBdXHkco+OtmrfTLAC
-1KISt3UaHKwWDPhrrQljCvua7IVIZgLtECo1MAFWIax5TyYO8S7yesuhmOS8488f
-4l5uUJ5grZEN8tMnh94jrke4AsATRVhkVFtcegIXjGcry8w3F3OiFJQ46cBRsWLV
-zMrSk5Zm1xs5ZjaBvoLOaavIF3IaC+MUqq1z8PaTBauMG/AsBzQOZJeZ365DLkaS
-fqh5hjr+yg9GnRSygrZ+csIDqs41cIpkzayI5AjX4R5emk2Xi7jKDlYYKHdI+WJv
-Ookcu1UW9rb/O/ITYI4YjGoInmOVHrMt49UFxIcbEKxtaB6yQGjb1g0/VBK+j1vj
-7tyKQeb/N4Df1DBCR9WGQPivGIdQw4fbpYeWHT0k1fA9cwM9g0g0rFPwX3h2O7XY
-25sGX/gHuOCw9hHX/Wd5ObI6NuE0AhHUy24L24aD7qtdEaL5DatSlpejOPPR/S9D
-XliN7nTnoUjsLImEHuRN
-=mBXc
+iQIcBAEBCgAGBQJS1WqzAAoJELnU8jG9FVirJjgP/izp+v9OdPYO3tmv88yVloRI
+BlsBHwUp6FNB8fjBS7aDyHcIzKg3ViL8DqesnReNGIaJiDDyZp7ld0X+SFWVL4ic
+j4Ecx8VqNSMSgyIh6jBDx+0biaBEz75bvTNjCE2y/cWgXn3DF3H4k3YtuYbwEx5K
+RtF84xu4W+OObh1yhDuYwZlLbCLWFQFyEo6kW/cRkWucP9XWHZk0+vIBdUy5Zk5T
+fR64lMTgtO6o9IZzShFCk5STQOWdKh0z5yjfnrsq4L3vXzlF5FGdnD+Ye8n4j2+y
+u9K9j2L7kkzqM/iEoxc9pgCgI/AbkM3Io/KyyZDeDl7CjblHImMqaBGSJ6cmpYKB
+mE2GXdqCHBFe7ZXdMhbVDw366g8U4hKfMaMb58OQxv0y/VR7ZjRBq9HBu6B5QT2B
+BbVPrlbPHpSHUxKGc1LLE4iU3G63dAVkU3ZWd87qH3FbrQ7L5DBw67czlevsSoYy
+O1EesePuHmBUpeMo2bK7FJp01PVjaDvWButONptMkZNvrjZCuggH8FIJ8Z5zVE4K
+J7MWKJiyb2/AvP9r886liykfBIqq125Ra8042L5bk7pEBHT6StMnWEXQwhQRfH9O
+X2g3PIHeLK/3C020YkWVdfoXxwDQTkMfi5j0+ZllEwwWB330B85uTW6CYp4SRLdy
+cEMaLQzOUY7dvuhhTv1O
+=zto6
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild
index fcb0ba2df6cf..0f20c316ad9c 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild,v 1.2 2014/01/13 07:38:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.10.26.ebuild,v 1.3 2014/01/14 16:49:53 jlec Exp $
 
 EAPI=5
 
@@ -48,6 +48,8 @@ src_unpack() {
 
 	unpack ${AUFS_TARBALL}
 
+	epatch "${FILESDIR}"/${P}-mmap-aufs3.patch
+
 	kernel-2_src_unpack
 }
 
diff --git a/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild
index 90685a77e880..f34c9acb39a8 100644
--- a/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild,v 1.3 2014/01/13 07:38:34 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.12.7.ebuild,v 1.4 2014/01/14 16:49:53 jlec Exp $
 
 EAPI=5
 
@@ -48,6 +48,8 @@ src_unpack() {
 
 	unpack ${AUFS_TARBALL}
 
+	epatch "${FILESDIR}"/${P}-mmap-aufs3.patch
+
 	kernel-2_src_unpack
 }
 
diff --git a/sys-kernel/aufs-sources/files/aufs-sources-3.10.26-mmap-aufs3.patch b/sys-kernel/aufs-sources/files/aufs-sources-3.10.26-mmap-aufs3.patch
new file mode 100644
index 000000000000..48f4da5ac714
--- /dev/null
+++ b/sys-kernel/aufs-sources/files/aufs-sources-3.10.26-mmap-aufs3.patch
@@ -0,0 +1,38 @@
+ aufs3-mmap.patch | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/aufs3-mmap.patch b/aufs3-mmap.patch
+index 398253b..d9b413c 100644
+--- a/aufs3-mmap.patch
++++ b/aufs3-mmap.patch
+@@ -215,24 +215,19 @@ index 7905fe7..94cc777 100644
+  	if (page->mapping != inode->i_mapping) {
+  		unlock_page(page);
+ diff --git a/mm/fremap.c b/mm/fremap.c
+-index 87da359..92bb6f2 100644
++index bbc4d66..7deee2c 100644
+ --- a/mm/fremap.c
+ +++ b/mm/fremap.c
+-@@ -202,11 +202,12 @@ get_write_lock:
+- 		 */
+- 		if (mapping_cap_account_dirty(mapping)) {
+- 			unsigned long addr;
+--			struct file *file = get_file(vma->vm_file);
+-+			struct file *file = vma->vm_file;
++@@ -211,7 +211,9 @@ get_write_lock:
++ 			/* mmap_region may free vma; grab the info now */
++ 			vm_flags = vma->vm_flags;
+  
+ +			vma_get_file(vma);
+- 			addr = mmap_region(file, start, size,
+- 					vma->vm_flags, pgoff);
+--			fput(file);
++ 			addr = mmap_region(file, start, size, vm_flags, pgoff);
+ +			vma_fput(vma);
++ 			fput(file);
+  			if (IS_ERR_VALUE(addr)) {
+  				err = addr;
+- 			} else {
+ diff --git a/mm/madvise.c b/mm/madvise.c
+ index 7055883..e6b768d 100644
+ --- a/mm/madvise.c
diff --git a/sys-kernel/aufs-sources/files/aufs-sources-3.12.7-mmap-aufs3.patch b/sys-kernel/aufs-sources/files/aufs-sources-3.12.7-mmap-aufs3.patch
new file mode 100644
index 000000000000..b4f7335a915b
--- /dev/null
+++ b/sys-kernel/aufs-sources/files/aufs-sources-3.12.7-mmap-aufs3.patch
@@ -0,0 +1,38 @@
+ aufs3-mmap.patch | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/aufs3-mmap.patch b/aufs3-mmap.patch
+index acebfa8..8682a6d 100644
+--- a/aufs3-mmap.patch
++++ b/aufs3-mmap.patch
+@@ -215,24 +215,19 @@ index ae4846f..3f890ee 100644
+  	if (page->mapping != inode->i_mapping) {
+  		unlock_page(page);
+ diff --git a/mm/fremap.c b/mm/fremap.c
+-index 5bff081..246a9c7 100644
++index bbc4d66..7deee2c 100644
+ --- a/mm/fremap.c
+ +++ b/mm/fremap.c
+-@@ -207,11 +207,12 @@ get_write_lock:
+- 		 */
+- 		if (mapping_cap_account_dirty(mapping)) {
+- 			unsigned long addr;
+--			struct file *file = get_file(vma->vm_file);
+-+			struct file *file = vma->vm_file;
++@@ -211,7 +211,9 @@ get_write_lock:
++ 			/* mmap_region may free vma; grab the info now */
++ 			vm_flags = vma->vm_flags;
+  
+ +			vma_get_file(vma);
+- 			addr = mmap_region(file, start, size,
+- 					vma->vm_flags, pgoff);
+--			fput(file);
++ 			addr = mmap_region(file, start, size, vm_flags, pgoff);
+ +			vma_fput(vma);
++ 			fput(file);
+  			if (IS_ERR_VALUE(addr)) {
+  				err = addr;
+- 			} else {
+ diff --git a/mm/madvise.c b/mm/madvise.c
+ index 539eeb9..5e700b1 100644
+ --- a/mm/madvise.c