From patchwork Tue Nov 14 23:06:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 10058545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3320C6056E for ; Tue, 14 Nov 2017 23:06:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2623629AA1 for ; Tue, 14 Nov 2017 23:06:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B19129AA6; Tue, 14 Nov 2017 23:06:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99DF029AB4 for ; Tue, 14 Nov 2017 23:06:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755339AbdKNXGo (ORCPT ); Tue, 14 Nov 2017 18:06:44 -0500 Received: from mail-io0-f195.google.com ([209.85.223.195]:51591 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756487AbdKNXGm (ORCPT ); Tue, 14 Nov 2017 18:06:42 -0500 Received: by mail-io0-f195.google.com with SMTP id g73so10612912ioj.8 for ; Tue, 14 Nov 2017 15:06:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yvxkwlF8swlIUaj+N4coHuzomi4AsXjXIoBv8VwSSXc=; b=HeKanTw1sGTSXVrK6sEY0kD8A7oiscDSx7Qq/Gux+qt1UvwJjbBjGA2eqfj14cFjsS 6t/misWcIM15qv9qLS8XcNcjjGI58Z99s5kCaUrWUOGWSaGm0rb/FAlhqHVflDwiSmuN fI/vneHBlEM5pMLmsg46mNFXAnJTzafadLHiiIFMdpYHZHii1mq7AbHN2EXee6LyIvRO i8ep/9/zqz1Gfb252PtwtqNNsUGBT/lZZl/Y4YUHLSm7RGnrbJy63n2lfWQmjSscEy4Q j9VrSJl5XBDYpX9Wz6D3nwOtgSeCb3XLB1ZTJy23BUxaOKHtetpZ6V0CvXvTw5+kxVVJ /wAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yvxkwlF8swlIUaj+N4coHuzomi4AsXjXIoBv8VwSSXc=; b=DmDumHHgRqD9hHyidqDRSrFCyT6rrHp0faGmV0AVlwSC9IzIaMOP0QQLCEvAKJCvBO EBYBAaY7DUNGxfrNMRjyyxoLmGE9G5UNVt96+pYuger9iD3VR87F0aEgLQf9JEXSWRij 5RTsnEUVsLQlHQlhm2ZYW1qZpx1H47ZX4dI/aMQpr+4xMLsVOdwh87ofRsdkxwLVaaZv nE72egh4vCDLoP0TPGeDZk+dkwJY9pVuQYM9U47mXe/DBl3cHZ7dbM/d44ZwrDP7hGz+ f5id/ZiKWyWKOJ3IijhP4gvwUS2Qj6toRP5dUDV75NZPnAWhOjRZkbnPRGaeMiqC6cT1 iLUQ== X-Gm-Message-State: AJaThX7Lg4qhO28al608Y3Le8F0TpzwKQlBr20oNhL4foC2hNsl+yUfY 041ur5IdosChFUfcqobka6g= X-Google-Smtp-Source: AGs4zMaRrbTO2T7bFyBq1I/Q+4jHuI7/trVV+ZTextrZoc9+xCPFsv4zbED23xubhaPMxiGRtrPEPw== X-Received: by 10.107.69.7 with SMTP id s7mr16785086ioa.108.1510700799843; Tue, 14 Nov 2017 15:06:39 -0800 (PST) Received: from ola-842mrw1.ad.garmin.com ([204.77.163.55]) by smtp.googlemail.com with ESMTPSA id e203sm6015236itb.32.2017.11.14.15.06.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2017 15:06:39 -0800 (PST) From: Joshua Watt X-Google-Original-From: Joshua Watt To: NeilBrown , Jeff Layton , Trond Myklebust , "J . Bruce Fields" Cc: linux-nfs@vger.kernel.org, Al Viro , David Howells , Joshua Watt Subject: [RFC v3 5/7] NFS: Propagate NFS_MOUNT_UNSHARED to clients Date: Tue, 14 Nov 2017 17:06:29 -0600 Message-Id: <20171114230631.14682-6-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171114230631.14682-1-JPEWhacker@gmail.com> References: <20171114230631.14682-1-JPEWhacker@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Propagating the flag allows operations to be performed on the client without affecting other mounts to the same client, much like operations on the superblock will not affect other superblocks. Signed-off-by: Joshua Watt --- fs/nfs/client.c | 9 +++++++-- fs/nfs/nfs3client.c | 2 ++ fs/nfs/nfs4client.c | 4 ++++ include/linux/nfs_fs_sb.h | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 7bab47d0dd07..9d88dea4bc59 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -328,6 +328,10 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat if (clp->cl_cons_state < 0) continue; + /* Don't match clients that don't want to be shared */ + if (test_bit(NFS_CS_UNSHARED, &clp->cl_flags)) + continue; + /* Different NFS versions cannot share the same nfs_client */ if (clp->rpc_ops != data->nfs_mod->rpc_ops) continue; @@ -428,7 +432,7 @@ init_client(struct nfs_client *new, const struct nfs_client_initdata *cl_init) */ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init) { - struct nfs_client *clp, *new = NULL; + struct nfs_client *clp = NULL, *new = NULL; struct nfs_net *nn = net_generic(cl_init->net, nfs_net_id); const struct nfs_rpc_ops *rpc_ops = cl_init->nfs_mod->rpc_ops; @@ -441,7 +445,8 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init) do { spin_lock(&nn->nfs_client_lock); - clp = nfs_match_client(cl_init); + if (!test_bit(NFS_CS_UNSHARED, &cl_init->init_flags)) + clp = nfs_match_client(cl_init); if (clp) { spin_unlock(&nn->nfs_client_lock); if (new) diff --git a/fs/nfs/nfs3client.c b/fs/nfs/nfs3client.c index 7879f2a0fcfd..b62bed41053f 100644 --- a/fs/nfs/nfs3client.c +++ b/fs/nfs/nfs3client.c @@ -102,6 +102,8 @@ struct nfs_client *nfs3_set_ds_client(struct nfs_server *mds_srv, if (mds_srv->flags & NFS_MOUNT_NORESVPORT) set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags); + if (mds_srv->flags & NFS_MOUNT_UNSHARED) + __set_bit(NFS_CS_UNSHARED, &cl_init.init_flags); /* Use the MDS nfs_client cl_ipaddr. */ nfs_init_timeout_values(&ds_timeout, ds_proto, ds_timeo, ds_retrans); diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index ef725106e45c..d4051dda29f0 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -852,6 +852,8 @@ static int nfs4_set_client(struct nfs_server *server, set_bit(NFS_CS_MIGRATION, &cl_init.init_flags); if (test_bit(NFS_MIG_TSM_POSSIBLE, &server->mig_status)) set_bit(NFS_CS_TSM_POSSIBLE, &cl_init.init_flags); + if (server->flags & NFS_MOUNT_UNSHARED) + __set_bit(NFS_CS_UNSHARED, &cl_init.init_flags); /* Allocate or find a client reference we can use */ clp = nfs_get_client(&cl_init); @@ -910,6 +912,8 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_server *mds_srv, if (mds_srv->flags & NFS_MOUNT_NORESVPORT) __set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags); + if (mds_srv->flags & NFS_MOUNT_UNSHARED) + __set_bit(NFS_CS_UNSHARED, &cl_init.init_flags); /* * Set an authflavor equual to the MDS value. Use the MDS nfs_client diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 5dac856355f0..0eb7093faea7 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h @@ -45,6 +45,7 @@ struct nfs_client { #define NFS_CS_INFINITE_SLOTS 3 /* - don't limit TCP slots */ #define NFS_CS_NO_RETRANS_TIMEOUT 4 /* - Disable retransmit timeouts */ #define NFS_CS_TSM_POSSIBLE 5 /* - Maybe state migration */ +#define NFS_CS_UNSHARED 6 /* - Client state not shared */ struct sockaddr_storage cl_addr; /* server identifier */ size_t cl_addrlen; char * cl_hostname; /* hostname of server */