Commit 52b0c342 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: remove support for CIFS_IOC_CHECKUMOUNT ioctl 



...as promised for 3.7.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent e5d04887

fs/cifs/ioctl.c

+0 −19
Original line number Diff line number Diff line
@@ -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)