From 2c57414e67dbd066a5eb05f484fb8cd0e818ea6a Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 2 May 2007 19:27:21 +0200
Subject: [PATCH] --- yaml --- r: 53939 b: refs/heads/master c:
 a106009bdfa12b6452b724cc0718ca8e1334745d h: refs/heads/master i:   53937:
 fcd42a090e9aed0d61d1e2f8d92cf0c66c945021   53935:
 4cd1de2f48e8c825073be4f658de7827d8c3cb26 v: v3

---
 [refs]            | 2 +-
 trunk/fs/compat.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7b079053b0ac..85b8424a8176 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c812d6c198c5f39a6ea22a9a12d518cd3714af16
+refs/heads/master: a106009bdfa12b6452b724cc0718ca8e1334745d
diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c
index 040a8be38a48..72e5e6923828 100644
--- a/trunk/fs/compat.c
+++ b/trunk/fs/compat.c
@@ -371,13 +371,14 @@ static void compat_ioctl_error(struct file *filp, unsigned int fd,
 			fn = "?";
 	}
 
-	sprintf(buf,"'%c'", (cmd>>24) & 0x3f);
+	sprintf(buf,"'%c'", (cmd>>_IOC_TYPESHIFT) & _IOC_TYPEMASK);
 	if (!isprint(buf[1]))
 		sprintf(buf, "%02x", buf[1]);
 	compat_printk("ioctl32(%s:%d): Unknown cmd fd(%d) "
-			"cmd(%08x){%s} arg(%08x) on %s\n",
+			"cmd(%08x){t:%s;sz:%u} arg(%08x) on %s\n",
 			current->comm, current->pid,
 			(int)fd, (unsigned int)cmd, buf,
+			(cmd >> _IOC_SIZESHIFT) & _IOC_SIZEMASK,
 			(unsigned int)arg, fn);
 
 	if (path)