Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1335051

[PATCH 07/45] staging/lustre: Remove unused osc_on_mdt function

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/45] Lustre cleanups green@linuxhacker.ru - 2016-02-16 06:50 +0100
  [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with pr_<level> green@linuxhacker.ru - 2016-02-16 06:50 +0100
    Re: [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with  pr_<level> Joe Perches <joe@perches.com> - 2016-02-16 07:00 +0100
      Re: [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with pr_<level> Oleg Drokin <green@linuxhacker.ru> - 2016-02-16 17:20 +0100
        Re: [PATCH 43/45] staging/lustre/libcfs: Replace use of printk with  pr_<level> Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-20 23:40 +0100
  [PATCH 41/45] staging/lustre/libcfs: Get rid of multiple assignments green@linuxhacker.ru - 2016-02-16 06:50 +0100
  [PATCH 45/45] staging/lustre: Convert cfs_str2num_check to use kstrtoul green@linuxhacker.ru - 2016-02-16 06:50 +0100
  [PATCH 44/45] staging/lustre: Convert cfs_trace_daemon_command to use kstrtoul green@linuxhacker.ru - 2016-02-16 06:50 +0100
  [PATCH 34/45] staging/lustre/libcfs: Remove unused cfs_tcd_owns_tage() function green@linuxhacker.ru - 2016-02-16 06:50 +0100
  [PATCH 32/45] staging/lustre/libcfs: Remove stray spaces after function name green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 39/45] staging/lustre: Update cfs_cpu_notify switch statement with a comment green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 38/45] staging/lustre/libcfs: Remove empty lines after/before braces green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 40/45] staging/lustre: Get rid of cfs_trace_buf_type_t typedef green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 37/45] staging/lustre/libcfs: Remove useless returns in void functions green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 19/45] staging/lustre/lclient: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 31/45] staging/lustre/libcfs: reformat cfs_tcd_for_each_type_lock define green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 22/45] staging/lustre/mgc: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 27/45] staging/lustre: Remove the "write to FSF to get a copy of GPL" wording green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 20/45] staging/lustre/include: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 29/45] staging/lustre/libcfs: Move EXPORT_SYMBOLs under function/variable green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 15/45] staging/lustre/ldlm: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 33/45] staging/lustre/libcfs: Shortened too long lines green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 16/45] staging/lustre/lmv: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 18/45] staging/lustre/fld: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 21/45] staging/lustre/mdc: Adjust NULL comparison codestyle green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 30/45] staging/lustre/libcfs: style change to add missing spaces for operations green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 28/45] staging/lustre/libcfs: Cleanup: parenthesis alignment adjustments green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 42/45] staging/lustre: Remove space after cast in cfs_crypto_hash_final() green@linuxhacker.ru - 2016-02-16 07:00 +0100
  [PATCH 07/45] staging/lustre: Remove unused osc_on_mdt function green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 06/45] staging/lustre: Remove unused function oti_init green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 10/45] staging/lustre: Remove commented out lock_lock_multi_match green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 09/45] staging/lustre: Remove server code from class_get_type() green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 11/45] staging/lustre/osc: Remove commented out osc_page_protected() green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 04/45] staging/lustre/llite: Get rid of /proc references in comments green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 05/45] staging/lustre/lov: Get rid of /proc references in comments green@linuxhacker.ru - 2016-02-16 07:10 +0100
  [PATCH 02/45] staging/lustre/obdclass: Get rid of /proc references in comments. green@linuxhacker.ru - 2016-02-16 07:10 +0100

csiph-web