From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v2 02/10] vfs: make dir_name arg to do_mount a const char * Date: Thu, 20 Sep 2012 10:23:11 -0400 Message-ID: <1348150999-13028-3-git-send-email-jlayton@redhat.com> References: <1348150999-13028-1-git-send-email-jlayton@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx1.redhat.com (ext-mx15.extmail.prod.ext.phx2.redhat.com [10.5.110.20]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q8KENUNC027471 for ; Thu, 20 Sep 2012 10:23:30 -0400 Received: from mail-qc0-f174.google.com (mail-qc0-f174.google.com [209.85.216.174]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8KENQGW010511 for ; Thu, 20 Sep 2012 10:23:29 -0400 Received: by mail-qc0-f174.google.com with SMTP id o28so2004906qcr.33 for ; Thu, 20 Sep 2012 07:23:29 -0700 (PDT) In-Reply-To: <1348150999-13028-1-git-send-email-jlayton@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: viro@zeniv.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org, acme@ghostprotocols.net List-Id: linux-audit@redhat.com Nothing changes it, so it should be safe to do. Signed-off-by: Jeff Layton --- fs/namespace.c | 2 +- include/linux/fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index 4d31f73..8e52b1c 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -2185,7 +2185,7 @@ int copy_mount_string(const void __user *data, char **where) * Therefore, if this magic number is present, it carries no information * and must be discarded. */ -long do_mount(char *dev_name, char *dir_name, char *type_page, +long do_mount(char *dev_name, const char *dir_name, char *type_page, unsigned long flags, void *data_page) { struct path path; diff --git a/include/linux/fs.h b/include/linux/fs.h index 69513a7..b6ce6fc 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2072,7 +2072,7 @@ extern struct vfsmount *kern_mount_data(struct file_system_type *, void *data); extern void kern_unmount(struct vfsmount *mnt); extern int may_umount_tree(struct vfsmount *); extern int may_umount(struct vfsmount *); -extern long do_mount(char *, char *, char *, unsigned long, void *); +extern long do_mount(char *, const char *, char *, unsigned long, void *); extern struct vfsmount *collect_mounts(struct path *); extern void drop_collected_mounts(struct vfsmount *); extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *, -- 1.7.11.4