mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 21:04:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: obd: rename LUSTRE_STRIPE_MAXBYTES

Browse Source 
Rename LUSTRE_STRIPE_MAXBYTES to LUSTRE_EXT3_STRIPE_MAXBYTES and
correct the comment describing its use.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675
Reviewed-on: http://review.whamcloud.com/11800
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John L. Hammond
2016-09-18 16:37:39 -04:00
committed by Greg Kroah-Hartman
parent f9acb591a1
commit b9d4b143de
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/lustre/lustre/include/obd.h
View File

@@ -73,10 +73,12 @@ static inline void loi_init(struct lov_oinfo *loi)
{
}
/* Until such time as we get_info the per-stripe maximum from the OST,
* we define this to be 2T - 4k, which is the ext3 maxbytes.
/*
* If we are unable to get the maximum object size from the OST in
* ocd_maxbytes using OBD_CONNECT_MAXBYTES, then we fall back to using
* the old maximum object size from ext3.
*/
#define LUSTRE_STRIPE_MAXBYTES 0x1fffffff000ULL
#define LUSTRE_EXT3_STRIPE_MAXBYTES 0x1fffffff000ULL
struct lov_stripe_md {
atomic_t lsm_refc;

6
drivers/staging/lustre/lustre/lov/lov_ea.c
View File

@@ -154,14 +154,14 @@ static int lsm_destroy_plain(struct lov_stripe_md *lsm, struct obdo *oa,
}
/* Find minimum stripe maxbytes value. For inactive or
* reconnecting targets use LUSTRE_STRIPE_MAXBYTES.
* reconnecting targets use LUSTRE_EXT3_STRIPE_MAXBYTES.
*/
static void lov_tgt_maxbytes(struct lov_tgt_desc *tgt, __u64 *stripe_maxbytes)
{
struct obd_import *imp = tgt->ltd_obd->u.cli.cl_import;
if (!imp || !tgt->ltd_active) {
*stripe_maxbytes = LUSTRE_STRIPE_MAXBYTES;
*stripe_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES;
return;
}
@@ -172,7 +172,7 @@ static void lov_tgt_maxbytes(struct lov_tgt_desc *tgt, __u64 *stripe_maxbytes)
if (*stripe_maxbytes > imp->imp_connect_data.ocd_maxbytes)
*stripe_maxbytes = imp->imp_connect_data.ocd_maxbytes;
} else {
*stripe_maxbytes = LUSTRE_STRIPE_MAXBYTES;
*stripe_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES;
}
spin_unlock(&imp->imp_lock);
}

2
drivers/staging/lustre/lustre/lov/lov_pack.c
View File

@@ -284,7 +284,7 @@ int lov_alloc_memmd(struct lov_stripe_md **lsmp, __u16 stripe_count,
spin_lock_init(&(*lsmp)->lsm_lock);
(*lsmp)->lsm_magic = magic;
(*lsmp)->lsm_stripe_count = stripe_count;
(*lsmp)->lsm_maxbytes = LUSTRE_STRIPE_MAXBYTES * stripe_count;
(*lsmp)->lsm_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES * stripe_count;
(*lsmp)->lsm_pattern = pattern;
(*lsmp)->lsm_pool_name[0] = '\0';
(*lsmp)->lsm_layout_gen = 0;

2
drivers/staging/lustre/lustre/obdecho/echo_client.c
View File

@@ -454,7 +454,7 @@ static int echo_alloc_memmd(struct echo_device *ed,
}
loi_init((*lsmp)->lsm_oinfo[0]);
(*lsmp)->lsm_maxbytes = LUSTRE_STRIPE_MAXBYTES;
(*lsmp)->lsm_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES;
ostid_set_seq_echo(&(*lsmp)->lsm_oi);
return lsm_size;

2
drivers/staging/lustre/lustre/osc/osc_request.c
View File

@@ -190,7 +190,7 @@ static int osc_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
(imp->imp_connect_data.ocd_connect_flags & OBD_CONNECT_MAXBYTES))
(*lsmp)->lsm_maxbytes = imp->imp_connect_data.ocd_maxbytes;
else
(*lsmp)->lsm_maxbytes = LUSTRE_STRIPE_MAXBYTES;
(*lsmp)->lsm_maxbytes = LUSTRE_EXT3_STRIPE_MAXBYTES;
return lsm_size;
}