summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-05-16 07:13:17 -0400
committerSteve French <sfrench@us.ibm.com>2012-05-16 20:13:32 -0500
commit4d61cd6ec764368689fab3bd19e78d76c1e6b176 (patch)
tree55159a150062c1fda2e5d9227ec8bd6c477a2b31
parent5e500ed125f3b153aa3f228657723189e9f4c82e (diff)
downloadlinux-stable-4d61cd6ec764368689fab3bd19e78d76c1e6b176.tar.gz
linux-stable-4d61cd6ec764368689fab3bd19e78d76c1e6b176.tar.bz2
linux-stable-4d61cd6ec764368689fab3bd19e78d76c1e6b176.zip
cifs: add a deprecation warning to CIFS_IOC_CHECKUMOUNT ioctl
This was used by an ancient version of umount.cifs and in nowhere else that I'm aware of. Let's add a warning now and dump it for 3.7. Signed-off-by: Jeff Layton <jlayton@redhat.com>
-rw-r--r--fs/cifs/ioctl.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c
index 4221b5e48a42..6d2667f0c98c 100644
--- a/fs/cifs/ioctl.c
+++ b/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;