From patchwork Thu Jun 19 14:50:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4384431 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C976B9F1D6 for ; Thu, 19 Jun 2014 14:53:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2E022038F for ; Thu, 19 Jun 2014 14:53:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E51520384 for ; Thu, 19 Jun 2014 14:53:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932547AbaFSOxJ (ORCPT ); Thu, 19 Jun 2014 10:53:09 -0400 Received: from mail-qc0-f177.google.com ([209.85.216.177]:33073 "EHLO mail-qc0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932579AbaFSOxH (ORCPT ); Thu, 19 Jun 2014 10:53:07 -0400 Received: by mail-qc0-f177.google.com with SMTP id r5so2240484qcx.8 for ; Thu, 19 Jun 2014 07:53:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=z+qRTUfGZZqM3KaPNiIpZKKYB1gLMUyZW9hjVEWjVE4=; b=JokxXW6RXarSHgwtn53stYabGFJd8U6NTL1mlsvApWqDSTUGQUnx3VhYwEWiG8N+bv s/a1hRlhyPNIibkKdyjTE0V7KcQ8Mb6Prd/ULpwSqFqyoYoaSxBBRI5dDsrzidsM86gS 3EzsrR6CKckLvIBdP5fcZKkRS8P76OB+eCM9+eCc3XhJPprLPHNwmKOzOvcnfecbjars v3buoocnI4HEZWKeQk1a6ROZwrLGPiR7Q8Q6BuP4jmvkONeefSFr8xSqH4TT1OQLLleg 9WeSU9DLN1kUo9Ya5ef99Gl1AjKhJap7Q2GIS8ePm9G8WHLURtrvVrUrPcgdbSuef2EB uviQ== X-Gm-Message-State: ALoCoQkbuHbqEL+P2GT3tFrgvzw0o4E+h/cGJmxpWbt9/n5H5PJzca5jg/2im84i35HSpzPmouEP X-Received: by 10.224.46.66 with SMTP id i2mr7954236qaf.22.1403189586552; Thu, 19 Jun 2014 07:53:06 -0700 (PDT) Received: from tlielax.poochiereds.net (cpe-107-015-124-230.nc.res.rr.com. [107.15.124.230]) by mx.google.com with ESMTPSA id r60sm3364044qgd.26.2014.06.19.07.53.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 07:53:05 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 090/104] nfsd: remove old fault injection infrastructure Date: Thu, 19 Jun 2014 10:50:36 -0400 Message-Id: <1403189450-18729-91-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1403189450-18729-1-git-send-email-jlayton@primarydata.com> References: <1403189450-18729-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Remove the old nfsd_for_n_state function and move nfsd_find_client higher up into the file to get rid of forward declaration. Remove the struct nfsd_fault_inject_op arguments from the operations as they are no longer needed by any of them. Finally, remove the old "standard" get and set routines, which also eliminates the client_mutex from this code. Signed-off-by: Jeff Layton --- fs/nfsd/fault_inject.c | 51 ++++--------------------------- fs/nfsd/nfs4state.c | 83 ++++++++++++++++++-------------------------------- fs/nfsd/state.h | 40 +++++++++++------------- 3 files changed, 54 insertions(+), 120 deletions(-) diff --git a/fs/nfsd/fault_inject.c b/fs/nfsd/fault_inject.c index aa114c893189..13886a1cefdc 100644 --- a/fs/nfsd/fault_inject.c +++ b/fs/nfsd/fault_inject.c @@ -17,52 +17,13 @@ struct nfsd_fault_inject_op { char *file; - u64 (*get)(struct nfsd_fault_inject_op *); - u64 (*set_val)(struct nfsd_fault_inject_op *, u64); - u64 (*set_clnt)(struct nfsd_fault_inject_op *, - struct sockaddr_storage *, size_t); - u64 (*forget)(struct nfs4_client *, u64); - u64 (*print)(struct nfs4_client *, u64); + u64 (*get)(void); + u64 (*set_val)(u64); + u64 (*set_clnt)(struct sockaddr_storage *, size_t); }; static struct dentry *debug_dir; -static u64 nfsd_inject_set(struct nfsd_fault_inject_op *op, u64 val) -{ - u64 count; - - nfs4_lock_state(); - count = nfsd_for_n_state(val, op->forget); - nfs4_unlock_state(); - return count; -} - -static u64 nfsd_inject_set_client(struct nfsd_fault_inject_op *op, - struct sockaddr_storage *addr, - size_t addr_size) -{ - struct nfs4_client *clp; - u64 count = 0; - - nfs4_lock_state(); - clp = nfsd_find_client(addr, addr_size); - if (clp) - count = op->forget(clp, 0); - nfs4_unlock_state(); - return count; -} - -static u64 nfsd_inject_get(struct nfsd_fault_inject_op *op) -{ - u64 count; - - nfs4_lock_state(); - count = nfsd_for_n_state(0, op->print); - nfs4_unlock_state(); - - return count; -} - static ssize_t fault_inject_read(struct file *file, char __user *buf, size_t len, loff_t *ppos) { @@ -73,7 +34,7 @@ static ssize_t fault_inject_read(struct file *file, char __user *buf, struct nfsd_fault_inject_op *op = file_inode(file)->i_private; if (!pos) - val = op->get(op); + val = op->get(); size = scnprintf(read_buf, sizeof(read_buf), "%llu\n", val); return simple_read_from_buffer(buf, len, ppos, read_buf, size); @@ -103,7 +64,7 @@ static ssize_t fault_inject_write(struct file *file, const char __user *buf, size = rpc_pton(net, write_buf, size, (struct sockaddr *)&sa, sizeof(sa)); if (size > 0) { - val = op->set_clnt(op, &sa, size); + val = op->set_clnt(&sa, size); if (val) printk(KERN_INFO "NFSD [%s]: Client %s had %llu state object(s)\n", op->file, write_buf, val); @@ -113,7 +74,7 @@ static ssize_t fault_inject_write(struct file *file, const char __user *buf, printk(KERN_INFO "NFSD Fault Injection: %s (all)", op->file); else printk(KERN_INFO "NFSD Fault Injection: %s (n = %llu)", op->file, val); - val = op->set_val(op, val); + val = op->set_val(val); printk(KERN_INFO "NFSD: %s: found %llu", op->file, val); } return len; /* on success, claim we got the whole input */ diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 3cae26492cf5..b9b5f9fee7fc 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5580,8 +5580,24 @@ nfs4_check_open_reclaim(clientid_t *clid, } #ifdef CONFIG_NFSD_FAULT_INJECTION +static struct nfs4_client * +nfsd_find_client(struct sockaddr_storage *addr, size_t addr_size) +{ + struct nfs4_client *clp; + struct nfsd_net *nn = net_generic(current->nsproxy->net_ns, nfsd_net_id); + + if (!nfsd_netns_ready(nn)) + return NULL; + + list_for_each_entry(clp, &nn->client_lru, cl_lru) { + if (memcmp(&clp->cl_addr, addr, addr_size) == 0) + return clp; + } + return NULL; +} + u64 -nfsd_inject_print_clients(struct nfsd_fault_inject_op *op) +nfsd_inject_print_clients(void) { struct nfs4_client *clp; u64 count = 0; @@ -5603,8 +5619,7 @@ nfsd_inject_print_clients(struct nfsd_fault_inject_op *op) } u64 -nfsd_inject_forget_client(struct nfsd_fault_inject_op *op, - struct sockaddr_storage *addr, size_t addr_size) +nfsd_inject_forget_client(struct sockaddr_storage *addr, size_t addr_size) { u64 count = 0; struct nfs4_client *clp; @@ -5630,7 +5645,7 @@ nfsd_inject_forget_client(struct nfsd_fault_inject_op *op, } u64 -nfsd_inject_forget_clients(struct nfsd_fault_inject_op *op, u64 max) +nfsd_inject_forget_clients(u64 max) { u64 count = 0; struct nfs4_client *clp, *next; @@ -5721,7 +5736,7 @@ nfsd_print_client_locks(struct nfs4_client *clp) } u64 -nfsd_inject_print_locks(struct nfsd_fault_inject_op *op) +nfsd_inject_print_locks(void) { struct nfs4_client *clp; u64 count = 0; @@ -5753,8 +5768,7 @@ nfsd_reap_locks(struct list_head *reaplist) } u64 -nfsd_inject_forget_client_locks(struct nfsd_fault_inject_op *op, - struct sockaddr_storage *addr, size_t addr_size) +nfsd_inject_forget_client_locks(struct sockaddr_storage *addr, size_t addr_size) { unsigned int count = 0; struct nfs4_client *clp; @@ -5774,7 +5788,7 @@ nfsd_inject_forget_client_locks(struct nfsd_fault_inject_op *op, } u64 -nfsd_inject_forget_locks(struct nfsd_fault_inject_op *op, u64 max) +nfsd_inject_forget_locks(u64 max) { u64 count = 0; struct nfs4_client *clp; @@ -5845,7 +5859,7 @@ nfsd_collect_client_openowners(struct nfs4_client *clp, struct list_head *collec } u64 -nfsd_inject_print_openowners(struct nfsd_fault_inject_op *op) +nfsd_inject_print_openowners(void) { struct nfs4_client *clp; u64 count = 0; @@ -5877,8 +5891,7 @@ nfsd_reap_openowners(struct list_head *reaplist) } u64 -nfsd_inject_forget_client_openowners(struct nfsd_fault_inject_op *op, - struct sockaddr_storage *addr, size_t addr_size) +nfsd_inject_forget_client_openowners(struct sockaddr_storage *addr, size_t addr_size) { unsigned int count = 0; struct nfs4_client *clp; @@ -5898,7 +5911,7 @@ nfsd_inject_forget_client_openowners(struct nfsd_fault_inject_op *op, } u64 -nfsd_inject_forget_openowners(struct nfsd_fault_inject_op *op, u64 max) +nfsd_inject_forget_openowners(u64 max) { u64 count = 0; struct nfs4_client *clp; @@ -5959,7 +5972,7 @@ nfsd_print_client_delegations(struct nfs4_client *clp) } u64 -nfsd_inject_print_delegations(struct nfsd_fault_inject_op *op) +nfsd_inject_print_delegations(void) { struct nfs4_client *clp; u64 count = 0; @@ -5991,8 +6004,7 @@ nfsd_forget_delegations(struct list_head *reaplist) } u64 -nfsd_inject_forget_client_delegations(struct nfsd_fault_inject_op *op, - struct sockaddr_storage *addr, size_t addr_size) +nfsd_inject_forget_client_delegations(struct sockaddr_storage *addr, size_t addr_size) { u64 count = 0; struct nfs4_client *clp; @@ -6013,7 +6025,7 @@ nfsd_inject_forget_client_delegations(struct nfsd_fault_inject_op *op, } u64 -nfsd_inject_forget_delegations(struct nfsd_fault_inject_op *op, u64 max) +nfsd_inject_forget_delegations(u64 max) { u64 count = 0; struct nfs4_client *clp; @@ -6049,8 +6061,7 @@ nfsd_recall_delegations(struct list_head *reaplist) } u64 -nfsd_inject_recall_client_delegations(struct nfsd_fault_inject_op *op, - struct sockaddr_storage *addr, size_t addr_size) +nfsd_inject_recall_client_delegations(struct sockaddr_storage *addr, size_t addr_size) { u64 count = 0; struct nfs4_client *clp; @@ -6071,7 +6082,7 @@ nfsd_inject_recall_client_delegations(struct nfsd_fault_inject_op *op, } u64 -nfsd_inject_recall_delegations(struct nfsd_fault_inject_op *op, u64 max) +nfsd_inject_recall_delegations(u64 max) { u64 count = 0; struct nfs4_client *clp, *next; @@ -6091,40 +6102,6 @@ nfsd_inject_recall_delegations(struct nfsd_fault_inject_op *op, u64 max) nfsd_recall_delegations(&reaplist); return count; } - -u64 nfsd_for_n_state(u64 max, u64 (*func)(struct nfs4_client *, u64)) -{ - struct nfs4_client *clp, *next; - u64 count = 0; - struct nfsd_net *nn = net_generic(current->nsproxy->net_ns, nfsd_net_id); - - if (!nfsd_netns_ready(nn)) - return 0; - - list_for_each_entry_safe(clp, next, &nn->client_lru, cl_lru) { - count += func(clp, max - count); - if ((max != 0) && (count >= max)) - break; - } - - return count; -} - -struct nfs4_client *nfsd_find_client(struct sockaddr_storage *addr, size_t addr_size) -{ - struct nfs4_client *clp; - struct nfsd_net *nn = net_generic(current->nsproxy->net_ns, nfsd_net_id); - - if (!nfsd_netns_ready(nn)) - return NULL; - - list_for_each_entry(clp, &nn->client_lru, cl_lru) { - if (memcmp(&clp->cl_addr, addr, addr_size) == 0) - return clp; - } - return NULL; -} - #endif /* CONFIG_NFSD_FAULT_INJECTION */ /* diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 4f6b65189031..03cc1ca7b974 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -467,30 +467,26 @@ extern void nfsd4_record_grace_done(struct nfsd_net *nn, time_t boot_time); /* nfs fault injection functions */ #ifdef CONFIG_NFSD_FAULT_INJECTION -struct nfsd_fault_inject_op; - int nfsd_fault_inject_init(void); void nfsd_fault_inject_cleanup(void); -u64 nfsd_for_n_state(u64, u64 (*)(struct nfs4_client *, u64)); -struct nfs4_client *nfsd_find_client(struct sockaddr_storage *, size_t); - -u64 nfsd_inject_print_clients(struct nfsd_fault_inject_op *op); -u64 nfsd_inject_forget_client(struct nfsd_fault_inject_op *, struct sockaddr_storage *, size_t); -u64 nfsd_inject_forget_clients(struct nfsd_fault_inject_op *, u64); - -u64 nfsd_inject_print_locks(struct nfsd_fault_inject_op *); -u64 nfsd_inject_forget_client_locks(struct nfsd_fault_inject_op *, struct sockaddr_storage *, size_t); -u64 nfsd_inject_forget_locks(struct nfsd_fault_inject_op *, u64); - -u64 nfsd_inject_print_openowners(struct nfsd_fault_inject_op *); -u64 nfsd_inject_forget_client_openowners(struct nfsd_fault_inject_op *, struct sockaddr_storage *, size_t); -u64 nfsd_inject_forget_openowners(struct nfsd_fault_inject_op *, u64); - -u64 nfsd_inject_print_delegations(struct nfsd_fault_inject_op *); -u64 nfsd_inject_forget_client_delegations(struct nfsd_fault_inject_op *, struct sockaddr_storage *, size_t); -u64 nfsd_inject_forget_delegations(struct nfsd_fault_inject_op *, u64); -u64 nfsd_inject_recall_client_delegations(struct nfsd_fault_inject_op *, struct sockaddr_storage *, size_t); -u64 nfsd_inject_recall_delegations(struct nfsd_fault_inject_op *, u64); + +u64 nfsd_inject_print_clients(void); +u64 nfsd_inject_forget_client(struct sockaddr_storage *, size_t); +u64 nfsd_inject_forget_clients(u64); + +u64 nfsd_inject_print_locks(void); +u64 nfsd_inject_forget_client_locks(struct sockaddr_storage *, size_t); +u64 nfsd_inject_forget_locks(u64); + +u64 nfsd_inject_print_openowners(void); +u64 nfsd_inject_forget_client_openowners(struct sockaddr_storage *, size_t); +u64 nfsd_inject_forget_openowners(u64); + +u64 nfsd_inject_print_delegations(void); +u64 nfsd_inject_forget_client_delegations(struct sockaddr_storage *, size_t); +u64 nfsd_inject_forget_delegations(u64); +u64 nfsd_inject_recall_client_delegations(struct sockaddr_storage *, size_t); +u64 nfsd_inject_recall_delegations(u64); #else /* CONFIG_NFSD_FAULT_INJECTION */ static inline int nfsd_fault_inject_init(void) { return 0; } static inline void nfsd_fault_inject_cleanup(void) {}