From ec46442070b675fae79ad601c20a28ea37ddacf1 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 16 May 2012 07:13:17 -0400
Subject: [PATCH] --- yaml --- r: 308795 b: refs/heads/master c:
 4d61cd6ec764368689fab3bd19e78d76c1e6b176 h: refs/heads/master i:   308793:
 2820b7ba667339794569e8fa8e6a557850ef543f   308791:
 57d82515734061147d89a39320ef4ad10cd8941d v: v3

---
 [refs]                | 2 +-
 trunk/fs/cifs/ioctl.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 74c0c8847390..1a37b954354b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e500ed125f3b153aa3f228657723189e9f4c82e
+refs/heads/master: 4d61cd6ec764368689fab3bd19e78d76c1e6b176
diff --git a/trunk/fs/cifs/ioctl.c b/trunk/fs/cifs/ioctl.c
index 4221b5e48a42..6d2667f0c98c 100644
--- a/trunk/fs/cifs/ioctl.c
+++ b/trunk/fs/cifs/ioctl.c
@@ -51,7 +51,15 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)
 	cifs_sb = CIFS_SB(inode->i_sb);
 
 	switch (command) {
+		static bool warned = false;
 		case CIFS_IOC_CHECKUMOUNT:
+			if (!warned) {
+				warned = true;
+				cERROR(1, "the CIFS_IOC_CHECKMOUNT ioctl will "
+					  "be deprecated in 3.7. Please "
+					  "migrate away from the use of "
+					  "umount.cifs");
+			}
 			cFYI(1, "User unmount attempted");
 			if (cifs_sb->mnt_uid == current_uid())
 				rc = 0;