From patchwork Wed Sep 5 13:58:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1409611 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 240C840220 for ; Wed, 5 Sep 2012 13:58:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750978Ab2IEN6e (ORCPT ); Wed, 5 Sep 2012 09:58:34 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:46833 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751505Ab2IEN6e (ORCPT ); Wed, 5 Sep 2012 09:58:34 -0400 Received: by qcro28 with SMTP id o28so75219qcr.19 for ; Wed, 05 Sep 2012 06:58:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=Y3c9p1mZwhRJd0fnz7qpejdkAj3ZGpSav7ZAqWftsT8=; b=hzHJO+sow0OxH3/H1fZh8bPLJ4p8yCv7mEsYi8e4mBjG1RkK+1BmxHCwTrwE+CY2ti 0XFw3pFr1xglx90VDEen0To7vB73Vy/NR0Cf9lcnb4Ib685M/o2t6h6OhaG7XnfDKpNp fv9NcYNwxYexHU8w3ZNFmluw5QLYDWIJt7d3N4AkYE0qcJCaT5jfsvuRjtn0HYA9BnwM PjG94OPRKt6SAwVxrQtD7kvIWjnrEXt+Lgl/C8tM4P1hqD8QKat4bTBz41nNNzHZh7xa tymJCbK2f9pikN+Ikmft9Cx27vpTHRCipwZl5G+pHe8Hz0C1G3CkraZO5Mc3sTSOzkYK gTnA== Received: by 10.224.174.134 with SMTP id t6mr45430864qaz.90.1346853513673; Wed, 05 Sep 2012 06:58:33 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-069-134-145-027.nc.res.rr.com. [69.134.145.27]) by mx.google.com with ESMTPS id m4sm767789qak.6.2012.09.05.06.58.32 (version=SSLv3 cipher=OTHER); Wed, 05 Sep 2012 06:58:32 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, piastryyy@gmail.com Subject: [PATCH] cifs: remove support for CIFS_IOC_CHECKUMOUNT ioctl Date: Wed, 5 Sep 2012 09:58:29 -0400 Message-Id: <1346853509-13438-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.4 X-Gm-Message-State: ALoCoQniFlz92PIUb/PnrK5aDgB0AsQrtaUWcVjCDtt7TnKTPg55ktlSLB+yCYsQ4ct/Hgcn381w Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org ...as promised for 3.7. Signed-off-by: Jeff Layton Reviewed-by: Pavel Shilovsky --- fs/cifs/ioctl.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index 5b3481b..fd5009d 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)