summaryrefslogtreecommitdiffstats
path: root/fs/cifs/ioctl.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2012-09-19 15:20:27 -0700
committerSteve French <smfrench@gmail.com>2012-09-24 21:46:35 -0500
commit52b0c3427e5baf14f1ffb92cf8ae542160ec6a07 (patch)
tree8c2f5eb5ce188bbb3a901a5e0d208c575544b953 /fs/cifs/ioctl.c
parente5d04887196ee30423c79e52043d418e04012954 (diff)
downloadlinux-52b0c3427e5baf14f1ffb92cf8ae542160ec6a07.tar.gz
linux-52b0c3427e5baf14f1ffb92cf8ae542160ec6a07.tar.bz2
linux-52b0c3427e5baf14f1ffb92cf8ae542160ec6a07.zip
cifs: remove support for CIFS_IOC_CHECKUMOUNT ioctl
...as promised for 3.7. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/ioctl.c')
-rw-r--r--fs/cifs/ioctl.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c
index 5b3481bd3d96..fd5009d56f9f 100644
--- a/fs/cifs/ioctl.c
+++ b/fs/cifs/ioctl.c
@@ -28,8 +28,6 @@
#include "cifs_debug.h"
#include "cifsfs.h"
-#define CIFS_IOC_CHECKUMOUNT _IO(0xCF, 2)
-
long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg)
{
struct inode *inode = filep->f_dentry->d_inode;
@@ -51,23 +49,6 @@ 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;
- else {
- rc = -EACCES;
- cFYI(1, "uids do not match");
- }
- break;
#ifdef CONFIG_CIFS_POSIX
case FS_IOC_GETFLAGS:
if (pSMBFile == NULL)