[kernel] r17070 - in dists/trunk/linux-2.6/debian: . patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Tue Mar 15 05:45:21 2011
New Revision: 17070

Log:
ext4: Disable FS_IOC_FIEMAP ioctl temporarily

Added:
   dists/trunk/linux-2.6/debian/patches/debian/ext4-Disable-FS_IOC_FIEMAP-ioctl-temporarily.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Mar 15 05:16:54 2011	(r17069)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Mar 15 05:45:21 2011	(r17070)
@@ -10,6 +10,8 @@
   * Remove the Big Kernel Lock:
     - adfs,appletalk,i810,ufs,usbip: Refactor locking
     - hpfs: Disable HPFS_FS
+  * ext4: Disable FS_IOC_FIEMAP ioctl temporarily (together with fixes
+    for btrfs in 2.6.38, closes: #615035)
 
   [ Aurelien Jarno]
   * mips/malta-[45]kc: 

Added: dists/trunk/linux-2.6/debian/patches/debian/ext4-Disable-FS_IOC_FIEMAP-ioctl-temporarily.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/ext4-Disable-FS_IOC_FIEMAP-ioctl-temporarily.patch	Tue Mar 15 05:45:21 2011	(r17070)
@@ -0,0 +1,42 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 15 Mar 2011 05:35:24 +0000
+Subject: [PATCH] ext4: Disable FS_IOC_FIEMAP ioctl temporarily
+
+ext4 does not implement the fiemap operation correctly for extents
+that are subject to delayed allocation.  A fix is pending, but until
+that has been well-tested let's disable it.
+---
+ fs/ext4/file.c  |    2 ++
+ fs/ext4/namei.c |    2 ++
+ 2 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/fs/ext4/file.c b/fs/ext4/file.c
+index 7b80d54..6b1b1ec 100644
+--- a/fs/ext4/file.c
++++ b/fs/ext4/file.c
+@@ -282,6 +282,8 @@ const struct inode_operations ext4_file_inode_operations = {
+ 	.removexattr	= generic_removexattr,
+ #endif
+ 	.check_acl	= ext4_check_acl,
++#if 0
+ 	.fiemap		= ext4_fiemap,
++#endif
+ };
+ 
+diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
+index 5485390..dc5961d 100644
+--- a/fs/ext4/namei.c
++++ b/fs/ext4/namei.c
+@@ -2539,7 +2539,9 @@ const struct inode_operations ext4_dir_inode_operations = {
+ 	.removexattr	= generic_removexattr,
+ #endif
+ 	.check_acl	= ext4_check_acl,
++#if 0
+ 	.fiemap         = ext4_fiemap,
++#endif
+ };
+ 
+ const struct inode_operations ext4_special_inode_operations = {
+-- 
+1.7.4.1
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Tue Mar 15 05:16:54 2011	(r17069)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Tue Mar 15 05:45:21 2011	(r17070)
@@ -55,3 +55,4 @@
 + features/all/drm-i810-remove-the-BKL.patch
 + features/all/staging-usbip-convert-to-kthread.patch
 + features/all/ufs-remove-the-BKL.patch
++ debian/ext4-Disable-FS_IOC_FIEMAP-ioctl-temporarily.patch