From patchwork Mon Sep 20 23:01:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 196052 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8KN1pdH018180 for ; Mon, 20 Sep 2010 23:01:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757340Ab0ITXBu (ORCPT ); Mon, 20 Sep 2010 19:01:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25646 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756830Ab0ITXBr (ORCPT ); Mon, 20 Sep 2010 19:01:47 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8KN1jD3022638 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 20 Sep 2010 19:01:45 -0400 Received: from corrin.poochiereds.net (ovpn-113-92.phx2.redhat.com [10.3.113.92]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8KN1bBP001599; Mon, 20 Sep 2010 19:01:45 -0400 From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 05/15] cifs: temporarily rename cifs_sb->tcon to ptcon to catch stragglers Date: Mon, 20 Sep 2010 16:01:34 -0700 Message-Id: <1285023704-2159-6-git-send-email-jlayton@redhat.com> In-Reply-To: <1285023704-2159-1-git-send-email-jlayton@redhat.com> References: <1285023704-2159-1-git-send-email-jlayton@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 20 Sep 2010 23:01:51 +0000 (UTC) diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h index 7fde529..ba0afd3 100644 --- a/fs/cifs/cifs_fs_sb.h +++ b/fs/cifs/cifs_fs_sb.h @@ -39,7 +39,7 @@ #define CIFS_MOUNT_MF_SYMLINKS 0x10000 /* Minshall+French Symlinks enabled */ struct cifs_sb_info { - struct cifsTconInfo *tcon; /* primary mount */ + struct cifsTconInfo *ptcon; /* primary mount */ struct list_head nested_tcon_q; struct nls_table *local_nls; unsigned int rsize; diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 0bc8677..2f8d279 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -445,7 +445,7 @@ CIFS_SB(struct super_block *sb) static inline struct cifsTconInfo * cifs_sb_tcon(struct cifs_sb_info *cifs_sb) { - return cifs_sb->tcon; + return cifs_sb->ptcon; } static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 533ff75..fd9f61f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -2749,7 +2749,7 @@ try_mount_again: goto remote_path_check; } - cifs_sb->tcon = tcon; + cifs_sb->ptcon = tcon; /* do not care if following two calls succeed - informational */ if (!tcon->ipc) { @@ -3051,7 +3051,7 @@ cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb) if (cifs_sb_tcon(cifs_sb)) cifs_put_tcon(cifs_sb_tcon(cifs_sb)); - cifs_sb->tcon = NULL; + cifs_sb->ptcon = NULL; tmp = cifs_sb->prepath; cifs_sb->prepathlen = 0; cifs_sb->prepath = NULL;