From: green@linuxhacker.ru
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lustre Development List <lustre-devel@lists.lustre.org>,
Oleg Drokin <green@linuxhacker.ru>
Subject: [PATCH 07/45] staging/lustre: Remove unused osc_on_mdt function
Date: Tue, 16 Feb 2016 00:46:39 -0500 [thread overview]
Message-ID: <1455601637-3847710-8-git-send-email-green@linuxhacker.ru> (raw)
In-Reply-To: <1455601637-3847710-1-git-send-email-green@linuxhacker.ru>
From: Oleg Drokin <green@linuxhacker.ru>
This only makes sense on metadata server, so get rid of it.
Also remove now unused MDS_OSC_MAX_RIF_DEFAULT define
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
---
drivers/staging/lustre/lustre/include/obd.h | 1 -
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 28 +--------------------------
2 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
index 991d2c6..c64a499 100644
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@@ -216,7 +216,6 @@ struct timeout_item {
};
#define OSC_MAX_RIF_DEFAULT 8
-#define MDS_OSC_MAX_RIF_DEFAULT 50
#define OSC_MAX_RIF_MAX 256
#define OSC_MAX_DIRTY_DEFAULT (OSC_MAX_RIF_DEFAULT * 4)
#define OSC_MAX_DIRTY_MB_MAX 2048 /* arbitrary, but < MAX_LONG bytes */
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
index 3c8d441..b52ffc0 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
@@ -227,29 +227,6 @@ void client_destroy_import(struct obd_import *imp)
}
EXPORT_SYMBOL(client_destroy_import);
-/**
- * Check whether or not the OSC is on MDT.
- * In the config log,
- * osc on MDT
- * setup 0:{fsname}-OSTxxxx-osc[-MDTxxxx] 1:lustre-OST0000_UUID 2:NID
- * osc on client
- * setup 0:{fsname}-OSTxxxx-osc 1:lustre-OST0000_UUID 2:NID
- *
- **/
-static int osc_on_mdt(char *obdname)
-{
- char *ptr;
-
- ptr = strrchr(obdname, '-');
- if (ptr == NULL)
- return 0;
-
- if (strncmp(ptr + 1, "MDT", 3) == 0)
- return 1;
-
- return 0;
-}
-
/* Configure an RPC client OBD device.
*
* lcfg parameters:
@@ -400,10 +377,7 @@ int client_obd_setup(struct obd_device *obddev, struct lustre_cfg *lcfg)
} else if (totalram_pages >> (20 - PAGE_CACHE_SHIFT) <= 512 /* MB */) {
cli->cl_max_rpcs_in_flight = 4;
} else {
- if (osc_on_mdt(obddev->obd_name))
- cli->cl_max_rpcs_in_flight = MDS_OSC_MAX_RIF_DEFAULT;
- else
- cli->cl_max_rpcs_in_flight = OSC_MAX_RIF_DEFAULT;
+ cli->cl_max_rpcs_in_flight = OSC_MAX_RIF_DEFAULT;
}
rc = ldlm_get_ref();
if (rc) {
--
2.1.0
next prev parent reply other threads:[~2016-02-16 6:02 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 5:46 [PATCH 00/45] Lustre cleanups green
2016-02-16 5:46 ` [PATCH 01/45] staging/lustre/ptlrpc: Get rid of /proc references in comments green
2016-02-16 5:46 ` [PATCH 02/45] staging/lustre/obdclass: " green
2016-02-16 5:46 ` [PATCH 03/45] staging/lustre/libcfs: " green
2016-02-16 5:46 ` [PATCH 04/45] staging/lustre/llite: " green
2016-02-16 5:46 ` [PATCH 05/45] staging/lustre/lov: " green
2016-02-16 5:46 ` [PATCH 06/45] staging/lustre: Remove unused function oti_init green
2016-02-16 5:46 ` green [this message]
2016-02-16 5:46 ` [PATCH 08/45] staging/lustre: Remove server code from client_obd_setup() green
2016-02-16 5:46 ` [PATCH 09/45] staging/lustre: Remove server code from class_get_type() green
2016-02-16 5:46 ` [PATCH 10/45] staging/lustre: Remove commented out lock_lock_multi_match green
2016-02-16 5:46 ` [PATCH 11/45] staging/lustre/osc: Remove commented out osc_page_protected() green
2016-02-16 5:46 ` [PATCH 12/45] staging/lustre/libcfs: Adjust NULL comparison codestyle green
2016-02-16 5:46 ` [PATCH 13/45] staging/lustre/lov: " green
2016-02-16 5:46 ` [PATCH 14/45] staging/lustre/llite: " green
2016-02-16 5:46 ` [PATCH 15/45] staging/lustre/ldlm: " green
2016-02-16 5:46 ` [PATCH 16/45] staging/lustre/lmv: " green
2016-02-16 5:46 ` [PATCH 17/45] staging/lustre/fid: " green
2016-02-16 5:46 ` [PATCH 18/45] staging/lustre/fld: " green
2016-02-16 5:46 ` [PATCH 19/45] staging/lustre/lclient: " green
2016-02-16 5:46 ` [PATCH 20/45] staging/lustre/include: " green
2016-02-16 5:46 ` [PATCH 21/45] staging/lustre/mdc: " green
2016-02-16 5:46 ` [PATCH 22/45] staging/lustre/mgc: " green
2016-02-16 5:46 ` [PATCH 23/45] staging/lustre/obdclass: " green
2016-02-16 5:46 ` [PATCH 24/45] staging/lustre/obdecho: " green
2016-02-16 5:46 ` [PATCH 25/45] staging/lustre/osc: " green
2016-02-16 5:46 ` [PATCH 26/45] staging/lustre/ptlrpc: " green
2016-02-16 5:46 ` [PATCH 27/45] staging/lustre: Remove the "write to FSF to get a copy of GPL" wording green
2016-02-16 5:47 ` [PATCH 28/45] staging/lustre/libcfs: Cleanup: parenthesis alignment adjustments green
2016-02-16 5:47 ` [PATCH 29/45] staging/lustre/libcfs: Move EXPORT_SYMBOLs under function/variable green
2016-02-16 5:47 ` [PATCH 30/45] staging/lustre/libcfs: style change to add missing spaces for operations green
2016-02-16 5:47 ` [PATCH 31/45] staging/lustre/libcfs: reformat cfs_tcd_for_each_type_lock define green
2016-02-16 5:47 ` [PATCH 32/45] staging/lustre/libcfs: Remove stray spaces after function name green
2016-02-16 5:47 ` [PATCH 33/45] staging/lustre/libcfs: Shortened too long lines green
2016-02-16 5:47 ` [PATCH 34/45] staging/lustre/libcfs: Remove unused cfs_tcd_owns_tage() function green
2016-02-16 5:47 ` [PATCH 35/45] staging/lustre/libcfs: Move private tracefile structs out of header green
2016-02-16 5:47 ` [PATCH 36/45] staging/lustre/libcfs: Update comments style to match kernel green
2016-02-16 5:47 ` [PATCH 37/45] staging/lustre/libcfs: Remove useless returns in void functions green
2016-02-16 5:47 ` [PATCH 38/45] staging/lustre/libcfs: Remove empty lines after/before braces green
2016-02-16 5:47 ` [PATCH 39/45] staging/lustre: Update cfs_cpu_notify switch statement with a comment green
2016-02-16 5:47 ` [PATCH 40/45] staging/lustre: Get rid of cfs_trace_buf_type_t typedef green
2016-02-16 5:47 ` [PATCH 41/45] staging/lustre/libcfs: Get rid of multiple assignments green
2016-02-16 5:47 ` [PATCH 42/45] staging/lustre: Remove space after cast in cfs_crypto_hash_final() green
2016-02-16 5:47 ` [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with pr_<level> green
2016-02-16 5:55 ` Joe Perches
2016-02-16 16:12 ` Oleg Drokin
2016-02-20 22:34 ` Greg Kroah-Hartman
2016-02-16 5:47 ` [PATCH 44/45] staging/lustre: Convert cfs_trace_daemon_command to use kstrtoul green
2016-02-16 5:47 ` [PATCH 45/45] staging/lustre: Convert cfs_str2num_check " green
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=1455601637-3847710-8-git-send-email-green@linuxhacker.ru \
--to=green@linuxhacker.ru \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
/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