[kernel] r17116 - in dists/squeeze/linux-2.6/debian: . patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Fri Mar 25 03:16:34 2011
New Revision: 17116

Log:
btrfs, ext4: Disable FS_IOC_FIEMAP ioctl (Closes: #615035)

Added:
   dists/squeeze/linux-2.6/debian/patches/debian/btrfs-Disable-FS_IOC_FIEMAP-ioctl.patch
   dists/squeeze/linux-2.6/debian/patches/debian/ext4-Disable-FS_IOC_FIEMAP-ioctl.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/32

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Fri Mar 25 02:54:41 2011	(r17115)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Mar 25 03:16:34 2011	(r17116)
@@ -22,6 +22,8 @@
     (Closes: #619173)
   * [armel,hppa] Disable XFS_FS. It did not work correctly on these
     architectures until Linux 2.6.34. (Closes: #423562)
+  * btrfs, ext4: Disable FS_IOC_FIEMAP ioctl. It does not work correctly
+    for extents that are subject to delayed allocation. (Closes: #615035)
 
   [ dann frazier ]
   * Fix corrupted OSF partition table parsing (CVE-2011-1163)

Added: dists/squeeze/linux-2.6/debian/patches/debian/btrfs-Disable-FS_IOC_FIEMAP-ioctl.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/btrfs-Disable-FS_IOC_FIEMAP-ioctl.patch	Fri Mar 25 03:16:34 2011	(r17116)
@@ -0,0 +1,31 @@
+From 1f00f87ce7571ca9e85296fce5144f510cd7722b Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 25 Mar 2011 02:57:02 +0000
+Subject: [PATCH 1/2] btrfs: Disable FS_IOC_FIEMAP ioctl
+
+btrfs does not implement the fiemap operation correctly for extents
+that are subject to delayed allocation.  This has been fixed upstream,
+but would be tough to backport.
+---
+ fs/btrfs/inode.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
+index e03a836..bd10c29 100644
+--- a/fs/btrfs/inode.c
++++ b/fs/btrfs/inode.c
+@@ -4908,7 +4908,11 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb,
+ static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 		__u64 start, __u64 len)
+ {
++#if 0
+ 	return extent_fiemap(inode, fieinfo, start, len, btrfs_get_extent);
++#else
++	return -EOPNOTSUPP;
++#endif
+ }
+ 
+ int btrfs_readpage(struct file *file, struct page *page)
+-- 
+1.7.4.1
+

Added: dists/squeeze/linux-2.6/debian/patches/debian/ext4-Disable-FS_IOC_FIEMAP-ioctl.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/ext4-Disable-FS_IOC_FIEMAP-ioctl.patch	Fri Mar 25 03:16:34 2011	(r17116)
@@ -0,0 +1,35 @@
+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
+
+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/extents.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
+index f375559..bf3fbaa 100644
+--- a/fs/ext4/extents.c
++++ b/fs/ext4/extents.c
+@@ -3849,6 +3849,7 @@ static int ext4_xattr_fiemap(struct inode *inode,
+ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 		__u64 start, __u64 len)
+ {
++#if 0
+ 	ext4_lblk_t start_blk;
+ 	int error = 0;
+ 
+@@ -3881,5 +3882,8 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
+ 	}
+ 
+ 	return error;
++#else
++	return -EOPNOTSUPP;
++#endif
+ }
+ 
+-- 
+1.7.4.1
+

Modified: dists/squeeze/linux-2.6/debian/patches/series/32
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/32	Fri Mar 25 02:54:41 2011	(r17115)
+++ dists/squeeze/linux-2.6/debian/patches/series/32	Fri Mar 25 03:16:34 2011	(r17116)
@@ -10,3 +10,5 @@
 + bugfix/all/xfs-prevent-leaking-uninitialized-stack-memory-in-FSGEOMETRY_V1.patch
 + bugfix/all/stable/2.6.32.34.patch
 + bugfix/all/stable/2.6.32.35.patch
++ debian/btrfs-Disable-FS_IOC_FIEMAP-ioctl.patch
++ debian/ext4-Disable-FS_IOC_FIEMAP-ioctl.patch