From patchwork Fri Mar 26 14:25:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 48646 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.samba.org (fn.samba.org [216.83.154.106]) by ozlabs.org (Postfix) with ESMTP id 157EDB7C09 for ; Sat, 27 Mar 2010 01:26:23 +1100 (EST) Received: from fn.samba.org (localhost [127.0.0.1]) by lists.samba.org (Postfix) with ESMTP id 0B01B46659; Fri, 26 Mar 2010 08:26:23 -0600 (MDT) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on fn.samba.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.8 tests=BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_NEUTRAL autolearn=ham version=3.2.5 X-Original-To: linux-cifs-client@lists.samba.org Delivered-To: linux-cifs-client@lists.samba.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by lists.samba.org (Postfix) with ESMTP id 68C7A46666 for ; Fri, 26 Mar 2010 08:25:51 -0600 (MDT) Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2QEPo0k008139 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 26 Mar 2010 10:25:50 -0400 Received: from localhost.localdomain (vpn-10-105.rdu.redhat.com [10.11.10.105]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2QEPdCk026868 for ; Fri, 26 Mar 2010 10:25:49 -0400 From: Jeff Layton To: linux-cifs-client@lists.samba.org Date: Fri, 26 Mar 2010 10:25:38 -0400 Message-Id: <1269613542-6402-16-git-send-email-jlayton@samba.org> In-Reply-To: <1269613542-6402-1-git-send-email-jlayton@samba.org> References: <1269613542-6402-1-git-send-email-jlayton@samba.org> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Subject: [linux-cifs-client] [PATCH 15/19] mount.cifs: move nomtab, fakemnt, and verboseflag flags to parsed_mount_info X-BeenThere: linux-cifs-client@lists.samba.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: The Linux CIFS VFS client List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-cifs-client-bounces@lists.samba.org Errors-To: linux-cifs-client-bounces@lists.samba.org From: Jeff Layton Signed-off-by: Jeff Layton --- mount.cifs.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mount.cifs.c b/mount.cifs.c index 36b6673..50c69a1 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -123,10 +123,12 @@ struct parsed_mount_info { char addrlist[MAX_ADDR_LIST_LEN]; unsigned int got_user:1; unsigned int got_password:1; + unsigned int fakemnt:1; + unsigned int nomtab:1; + unsigned int verboseflag:1; }; const char *thisprogram; -int verboseflag; const char *cifs_fstype = "cifs"; static int parse_unc(const char *unc_name, struct parsed_mount_info *parsed_info); @@ -389,7 +391,7 @@ static int open_cred_file(char *file_name, if (temp_val) { /* go past equals sign */ temp_val++; - if (verboseflag) + if (parsed_info->verboseflag) fprintf(stderr, "\nDomain %s\n", temp_val); @@ -566,7 +568,7 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info) "target ip address argument missing"); } else if (strnlen(value, MAX_ADDRESS_LEN) <= MAX_ADDRESS_LEN) { - if (verboseflag) + if (parsed_info->verboseflag) fprintf(stderr, "ip address %s override specified\n", value); @@ -1226,8 +1228,6 @@ int main(int argc, char **argv) char *dev_name = NULL, *orig_dev = NULL; char *currentaddress, *nextaddress; int rc = 0; - int nomtab = 0; - int fakemnt = 0; int already_uppercased = 0; size_t options_size = MAX_OPTIONS_LEN; size_t dev_len; @@ -1266,7 +1266,7 @@ int main(int argc, char **argv) rc = mount_cifs_usage(stdout); goto mount_exit; case 'n': - ++nomtab; + ++parsed_info->nomtab; break; case 'o': orgoptions = strndup(optarg, MAX_OPTIONS_LEN); @@ -1279,7 +1279,7 @@ int main(int argc, char **argv) parsed_info->flags |= MS_RDONLY; break; case 'v': - ++verboseflag; + ++parsed_info->verboseflag; break; case 'V': print_cifs_mount_version(); @@ -1288,7 +1288,7 @@ int main(int argc, char **argv) parsed_info->flags &= ~MS_RDONLY; break; case 'f': - ++fakemnt; + ++parsed_info->fakemnt; break; default: fprintf(stderr, "unknown command-line option: %c\n", c); @@ -1380,7 +1380,7 @@ mount_retry: strlcat(options, parsed_info->prefix, options_size); } - if (verboseflag) + if (parsed_info->verboseflag) fprintf(stderr, "mount.cifs kernel mount options: %s\n", options); @@ -1391,18 +1391,18 @@ mount_retry: */ strlcat(options, ",pass=", options_size); strlcat(options, parsed_info->password, options_size); - if (verboseflag) + if (parsed_info->verboseflag) fprintf(stderr, ",pass=********"); } - if (verboseflag) + if (parsed_info->verboseflag) fprintf(stderr, "\n"); rc = check_mtab(thisprogram, dev_name, mountpoint); if (rc) goto mount_exit; - if (!fakemnt + if (!parsed_info->fakemnt && mount(dev_name, ".", cifs_fstype, parsed_info->flags, options)) { switch (errno) { case ECONNREFUSED: @@ -1436,7 +1436,7 @@ mount_retry: goto mount_exit; } - if (!nomtab) + if (!parsed_info->nomtab) rc = add_mtab(dev_name, mountpoint, parsed_info->flags); mount_exit: