From: andros@netapp.com
To: trond.myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH pNFS wave 3 Version 3 05/18] NFSv4.1: new flag for state renewal check
Date: Mon, 28 Feb 2011 20:34:10 -0500 [thread overview]
Message-ID: <1298943263-2886-6-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1298943263-2886-5-git-send-email-andros@netapp.com>
From: Andy Adamson <andros@netapp.com>
Data servers not sharing a session with the mount MDS always have an empty
cl_superblocks list.
Replace the cl_superblocks empty list check to see if it is time to shut down
renewd with the NFS_CS_STOP_RENEW bit which is not set by such a data server.
Signed-off-by: Andy Adamson <andros@netapp.com>
---
fs/nfs/client.c | 5 +++++
fs/nfs/nfs4renewd.c | 6 +-----
include/linux/nfs_fs_sb.h | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index b9ed2a8..a86698c 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1019,14 +1019,19 @@ static void nfs_server_insert_lists(struct nfs_server *server)
spin_lock(&nfs_client_lock);
list_add_tail_rcu(&server->client_link, &clp->cl_superblocks);
list_add_tail(&server->master_link, &nfs_volume_list);
+ clear_bit(NFS_CS_STOP_RENEW, &clp->cl_res_state);
spin_unlock(&nfs_client_lock);
}
static void nfs_server_remove_lists(struct nfs_server *server)
{
+ struct nfs_client *clp = server->nfs_client;
+
spin_lock(&nfs_client_lock);
list_del_rcu(&server->client_link);
+ if (clp && list_empty(&clp->cl_superblocks))
+ set_bit(NFS_CS_STOP_RENEW, &clp->cl_res_state);
list_del(&server->master_link);
spin_unlock(&nfs_client_lock);
diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c
index 402143d..df8e7f3 100644
--- a/fs/nfs/nfs4renewd.c
+++ b/fs/nfs/nfs4renewd.c
@@ -64,12 +64,8 @@ nfs4_renew_state(struct work_struct *work)
ops = clp->cl_mvops->state_renewal_ops;
dprintk("%s: start\n", __func__);
- rcu_read_lock();
- if (list_empty(&clp->cl_superblocks)) {
- rcu_read_unlock();
+ if (test_bit(NFS_CS_STOP_RENEW, &clp->cl_res_state))
goto out;
- }
- rcu_read_unlock();
spin_lock(&clp->cl_lock);
lease = clp->cl_lease_time;
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index b197563..2c2dc18 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -30,6 +30,7 @@ struct nfs_client {
#define NFS_CS_CALLBACK 1 /* - callback started */
#define NFS_CS_IDMAP 2 /* - idmap started */
#define NFS_CS_RENEWD 3 /* - renewd started */
+#define NFS_CS_STOP_RENEW 4 /* no more state to renew */
struct sockaddr_storage cl_addr; /* server identifier */
size_t cl_addrlen;
char * cl_hostname; /* hostname of server */
--
1.6.6
next prev parent reply other threads:[~2011-03-01 17:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-01 1:34 [PATCH pNFS wave 3 Version 3 0/18] pNFS wave 3 submission Version 3 andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 01/18] NFSv4: remove CONFIG_NFS_V4 from nfs_read_data andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 02/18] NFSv4.1: put_layout_hdr can remove nfsi->layout andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 03/18] NFS move nfs_client initialization into nfs_get_client andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 04/18] NFSv4.1: send zero stateid seqid on v4.1 i/o andros
2011-03-01 1:34 ` andros [this message]
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 06/18] NFSv4.1: new flag for lease time check andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 07/18] NFSv4.1: add MDS mount DS only check andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 08/18] NFSv4.1: lseg refcounting andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 09/18] NFSv4.1: coelesce across layout stripes andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 10/18] NFSv4.1: shift pnfs_update_layout locations andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 11/18] NFSv4.1: generic read andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 12/18] NFSv4.1: data server connection andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 13/18] NFSv4.1: filelayout i/o helpers andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 14/18] NFSv4.1: filelayout read andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 15/18] NFSv4.1: filelayout async error handler andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 16/18] NFSv4.1 move deviceid cache to filelayout driver andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 17/18] NFSv4.1: turn off pNFS on ds connection failure andros
2011-03-01 1:34 ` [PATCH pNFS wave 3 Version 3 18/18] NFSv4.1: lseg documentation andros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298943263-2886-6-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@netapp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).