From patchwork Tue May 11 13:24:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: build mount.smb2 from mount.cifs Date: Tue, 11 May 2010 03:24:54 -0000 From: Jeff Layton X-Patchwork-Id: 52286 Message-Id: <20100511092454.1a99c3d9@corrin.poochiereds.net> To: Steve French Cc: linux-cifs-client@lists.samba.org On Fri, 7 May 2010 12:29:22 -0500 Steve French wrote: > Resending with updates from Jeff Layton comments included. > > On Fri, May 7, 2010 at 12:26 PM, Steve French wrote: > > mount.smb2 has different help (many fewer mount options) and different > > fsname, but otherwise can reuse all of the good work Jeff did on > > mount.cifs.  This patch allow mount.cifs to detect if run as > > mount.smb2 (to display different help and fsname). > > > Looks good overall. A couple of small whitespace and formatting issues. Does the attached patch look ok? Eventually we'll probably want to have "make install" add a mount.smb2 symlink, but we probably shouldn't do that until the filesystem is in mainline kernels. >From 970efd4ed4d05566da5d3250d020f9e49725b247 Mon Sep 17 00:00:00 2001 From: Steve French Date: Tue, 11 May 2010 09:18:25 -0400 Subject: [PATCH] mount.cifs: turn into a multicall binary for smb2 mount.smb2 has different help (many fewer mount options) and different fsname, but otherwise can reuse all of the good work Jeff did on mount.cifs. This patch allow mount.cifs to detect if run as mount.smb2 (to display different help and fsname). Signed-off-by: Steve French --- mount.cifs.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 68 insertions(+), 15 deletions(-) diff --git a/mount.cifs.c b/mount.cifs.c index c4eb59a..96c60cb 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -1,6 +1,6 @@ /* * Mount helper utility for Linux CIFS VFS (virtual filesystem) client - * Copyright (C) 2003,2008 Steve French (sfrench@us.ibm.com) + * Copyright (C) 2003,2010 Steve French (sfrench@us.ibm.com) * Copyright (C) 2008 Jeremy Allison (jra@samba.org) * Copyright (C) 2010 Jeff Layton (jlayton@samba.org) * @@ -149,6 +149,7 @@ struct parsed_mount_info { const char *thisprogram; const char *cifs_fstype = "cifs"; +const char *smb2_fstype = "smb2"; static int parse_unc(const char *unc_name, struct parsed_mount_info *parsed_info); @@ -257,6 +258,52 @@ static int mount_cifs_usage(FILE * stream) return 0; } +static int mount_smb2_usage(FILE *stream) +{ + fprintf(stream, "\nUsage: %s -o \n", + thisprogram); + fprintf(stream, "\nMount the remote target, specified as a UNC name,"); + fprintf(stream, " to a local directory.\n\nOptions:\n"); + fprintf(stream, "\tuser=\n\tpass=\n\tdom=\n"); + fprintf(stream, "\nLess commonly used options:"); + fprintf(stream, + "\n\tcredentials=,guest,perm,noperm,rw,ro,"); + fprintf(stream, + "\n\tsep=,iocharset=,exec,noexec"); + fprintf(stream, + "\n\tnolock,directio,sec=,sign"); + fprintf(stream, + "\n\tuid=,gid=,dir_mode=,file_mode="); + fprintf(stream, "\n\nRarely used options:"); + fprintf(stream, + "\n\tport=,rsize=,wsize=,unc=,ip=,"); + fprintf(stream, + "\n\tdev,nodev,hard,soft,intr,"); + fprintf(stream, + "\n\tnointr,ignorecase,noacl,prefixpath=,nobrl"); + fprintf(stream, + "\n\nOptions are described in more detail in the manual page"); + fprintf(stream, "\n\tman 8 mount.smb2\n"); + fprintf(stream, "\nTo display the version number of the mount helper:"); + fprintf(stream, "\n\tmount.smb2 -V\n"); + + if (stream == stderr) + return EX_USAGE; + return 0; +} + +static int mount_usage(FILE *stream) +{ + int rc; + + if (strcmp(thisprogram, "mount.smb2") == 0) + rc = mount_smb2_usage(stream); + else + rc = mount_cifs_usage(stream); + + return rc; +} + /* * CIFS has to "escape" commas in the password field so that they don't * end up getting confused for option delimiters. Copy password into pw @@ -1283,7 +1330,7 @@ static int check_mtab(const char *progname, const char *devname, } static int -add_mtab(char *devname, char *mountpoint, unsigned long flags) +add_mtab(char *devname, char *mountpoint, unsigned long flags, const char *fstype) { int rc = 0; uid_t uid; @@ -1342,7 +1389,7 @@ add_mtab(char *devname, char *mountpoint, unsigned long flags) mountent.mnt_fsname = devname; mountent.mnt_dir = mountpoint; - mountent.mnt_type = (char *)(void *)cifs_fstype; + mountent.mnt_type = (char *)(void *)fstype; mountent.mnt_opts = (char *)calloc(MTAB_OPTIONS_LEN, 1); if (mountent.mnt_opts) { if (flags & MS_RDONLY) @@ -1529,6 +1576,7 @@ int main(int argc, char **argv) size_t dev_len; struct parsed_mount_info *parsed_info = NULL; pid_t pid; + const char *fstype; rc = check_setuid(); if (rc) @@ -1543,11 +1591,11 @@ int main(int argc, char **argv) textdomain(PACKAGE); */ if (!argc || !argv) { - rc = mount_cifs_usage(stderr); + rc = mount_usage(stderr); goto mount_exit; } - thisprogram = argv[0]; + thisprogram = basename(argv[0]); if (thisprogram == NULL) thisprogram = "mount.cifs"; @@ -1569,7 +1617,7 @@ int main(int argc, char **argv) switch (c) { case '?': case 'h': /* help */ - rc = mount_cifs_usage(stdout); + rc = mount_usage(stdout); goto mount_exit; case 'n': ++parsed_info->nomtab; @@ -1598,13 +1646,13 @@ int main(int argc, char **argv) break; default: fprintf(stderr, "unknown command-line option: %c\n", c); - rc = mount_cifs_usage(stderr); + rc = mount_usage(stderr); goto mount_exit; } } if (argc < 3 || argv[optind] == NULL || argv[optind + 1] == NULL) { - rc = mount_cifs_usage(stderr); + rc = mount_usage(stderr); goto mount_exit; } @@ -1721,8 +1769,8 @@ mount_retry: } if (parsed_info->verboseflag) - fprintf(stderr, "mount.cifs kernel mount options: %s", - options); + fprintf(stderr, "%s kernel mount options: %s", + thisprogram, options); if (parsed_info->got_password) { /* @@ -1742,8 +1790,13 @@ mount_retry: if (rc) goto mount_exit; + if (strcmp(thisprogram, "mount.smb2") == 0) + fstype = smb2_fstype; + else + fstype = cifs_fstype; + if (!parsed_info->fakemnt - && mount(dev_name, ".", cifs_fstype, parsed_info->flags, options)) { + && mount(dev_name, ".", fstype, parsed_info->flags, options)) { switch (errno) { case ECONNREFUSED: case EHOSTUNREACH: @@ -1756,7 +1809,7 @@ mount_retry: goto mount_retry; case ENODEV: fprintf(stderr, - "mount error: cifs filesystem not supported by the system\n"); + "mount error: %s filesystem not supported by the system\n", fstype); break; case ENXIO: if (!already_uppercased && @@ -1772,14 +1825,14 @@ mount_retry: fprintf(stderr, "mount error(%d): %s\n", errno, strerror(errno)); fprintf(stderr, - "Refer to the mount.cifs(8) manual page (e.g. man " - "mount.cifs)\n"); + "Refer to the %s(8) manual page (e.g. man " + "%s)\n", thisprogram, thisprogram); rc = EX_FAIL; goto mount_exit; } if (!parsed_info->nomtab) - rc = add_mtab(dev_name, mountpoint, parsed_info->flags); + rc = add_mtab(dev_name, mountpoint, parsed_info->flags, fstype); mount_exit: if (parsed_info) { -- 1.6.6.1