rpms/kernel/F-10 linux-2.6-upstream-reverts.patch,1.6,1.6.2.1

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15686

Modified Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-upstream-reverts.patch 
Log Message:
revert broken 2.6.27.30 fiemap patch

linux-2.6-upstream-reverts.patch:
 drivers/firewire/fw-cdev.c        |    6 +++---
 drivers/firewire/fw-sbp2.c        |   38 +++++++++++++++++++++++++++-----------
 drivers/firewire/fw-topology.c    |    6 ++++--
 drivers/firewire/fw-transaction.h |    2 +-
 drivers/gpu/drm/i915/i915_dma.c   |    2 +-
 fs/compat_ioctl.c                 |    1 +
 6 files changed, 37 insertions(+), 18 deletions(-)

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -p -r1.6 -r1.6.2.1
--- linux-2.6-upstream-reverts.patch	9 Nov 2008 22:38:20 -0000	1.6
+++ linux-2.6-upstream-reverts.patch	17 Aug 2009 04:43:07 -0000	1.6.2.1
@@ -382,3 +382,45 @@ Signed-off-by: Greg Kroah-Hartman <gregk
  	int gap_count;
  	bool beta_repeaters_present;
  
+From 69130c7cf96ea853dc5be599dd6a4b98907d39cc Mon Sep 17 00:00:00 2001
+From: Eric Sandeen <sandeen at redhat.com>
+Date: Thu, 6 Aug 2009 15:07:37 -0700
+Subject: compat_ioctl: hook up compat handler for FIEMAP ioctl
+
+From: Eric Sandeen <sandeen at redhat.com>
+
+commit 69130c7cf96ea853dc5be599dd6a4b98907d39cc upstream.
+
+The FIEMAP_IOC_FIEMAP mapping ioctl was missing a 32-bit compat handler,
+which means that 32-bit suerspace on 64-bit kernels cannot use this ioctl
+command.
+
+The structure is nicely aligned, padded, and sized, so it is just this
+simple.
+
+Tested w/ 32-bit ioctl tester (from Josef) on a 64-bit kernel on ext4.
+
+Signed-off-by: Eric Sandeen <sandeen at redhat.com>
+Cc: <linux-ext4 at vger.kernel.org>
+Cc: Mark Lord <lkml at rtr.ca>
+Cc: Arnd Bergmann <arnd at arndb.de>
+Cc: Josef Bacik <josef at redhat.com>
+Cc: Jan Kara <jack at suse.cz>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ fs/compat_ioctl.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/fs/compat_ioctl.c
++++ b/fs/compat_ioctl.c
+@@ -1910,6 +1910,7 @@ COMPATIBLE_IOCTL(FIONCLEX)
+ COMPATIBLE_IOCTL(FIOASYNC)
+ COMPATIBLE_IOCTL(FIONBIO)
+ COMPATIBLE_IOCTL(FIONREAD)  /* This is also TIOCINQ */
++COMPATIBLE_IOCTL(FS_IOC_FIEMAP)
+ /* 0x00 */
+ COMPATIBLE_IOCTL(FIBMAP)
+ COMPATIBLE_IOCTL(FIGETBSZ)