From 0ce48543ef7ac9440ffc45aaef4d109043e9f2c2 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 6 Feb 2013 00:44:13 -0800
Subject: [PATCH] --- yaml --- r: 357837 b: refs/heads/master c:
 dbfb98af18194cff87d4c1dea8d43faf14eae2e7 h: refs/heads/master i:   357835:
 49434535124f3a53f6b37226fe4ac11f9840f006 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/cifs/cifsproto.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f1c22e76d0a2..f272de692cd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8abf2775dd425ec3c767ea7c5a51b45fc8be76c2
+refs/heads/master: dbfb98af18194cff87d4c1dea8d43faf14eae2e7
diff --git a/trunk/fs/cifs/cifsproto.h b/trunk/fs/cifs/cifsproto.h
index 0060ec2124bf..feb9b6e2ab5a 100644
--- a/trunk/fs/cifs/cifsproto.h
+++ b/trunk/fs/cifs/cifsproto.h
@@ -46,7 +46,8 @@ extern void _free_xid(unsigned int);
 ({								\
 	unsigned int __xid = _get_xid();				\
 	cFYI(1, "CIFS VFS: in %s as Xid: %u with uid: %d",	\
-	     __func__, __xid, current_fsuid());			\
+	     __func__, __xid,					\
+	     from_kuid(&init_user_ns, current_fsuid()));	\
 	__xid;							\
 })