Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1233551
)
LU-2675 obd: rename LUSTRE_STRIPE_MAXBYTES
00/11800/2
author
John L. Hammond
<john.hammond@intel.com>
Mon, 8 Sep 2014 14:01:14 +0000
(09:01 -0500)
committer
Oleg Drokin
<oleg.drokin@intel.com>
Wed, 24 Sep 2014 01:18:59 +0000
(
01:18
+0000)
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>
Change-Id: I320c86b3f90e8b0c12fd91d6ca95684fb84fe36c
Reviewed-on: http://review.whamcloud.com/11800
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
lustre/include/obd.h
patch
|
blob
|
history
lustre/lov/lov_ea.c
patch
|
blob
|
history
lustre/lov/lov_pack.c
patch
|
blob
|
history
lustre/obdecho/echo_client.c
patch
|
blob
|
history
lustre/osc/osc_request.c
patch
|
blob
|
history
diff --git
a/lustre/include/obd.h
b/lustre/include/obd.h
index
94ba798
..
b0d8fc9
100644
(file)
--- a/
lustre/include/obd.h
+++ b/
lustre/include/obd.h
@@
-84,9
+84,10
@@
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. */
-#define LUSTRE_STRIPE_MAXBYTES 0x1fffffff000ULL
+/* 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_EXT3_STRIPE_MAXBYTES 0x1fffffff000ULL
struct lov_stripe_md {
atomic_t lsm_refc;
diff --git
a/lustre/lov/lov_ea.c
b/lustre/lov/lov_ea.c
index
619c742
..
d55425a
100644
(file)
--- a/
lustre/lov/lov_ea.c
+++ b/
lustre/lov/lov_ea.c
@@
-159,13
+159,13
@@
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 == NULL || !tgt->ltd_active) {
-
*stripe_maxbytes = LUSTRE
_STRIPE_MAXBYTES;
+
*stripe_maxbytes = LUSTRE_EXT3
_STRIPE_MAXBYTES;
return;
}
@@
-176,7
+176,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);
}
diff --git
a/lustre/lov/lov_pack.c
b/lustre/lov/lov_pack.c
index
4326cea
..
0ede0a3
100644
(file)
--- a/
lustre/lov/lov_pack.c
+++ b/
lustre/lov/lov_pack.c
@@
-321,7
+321,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;
diff --git
a/lustre/obdecho/echo_client.c
b/lustre/obdecho/echo_client.c
index
b772829
..
638a216
100644
(file)
--- a/
lustre/obdecho/echo_client.c
+++ b/
lustre/obdecho/echo_client.c
@@
-501,7
+501,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);
diff --git
a/lustre/osc/osc_request.c
b/lustre/osc/osc_request.c
index
c2203c4
..
773cfb2
100644
(file)
--- a/
lustre/osc/osc_request.c
+++ b/
lustre/osc/osc_request.c
@@
-157,7
+157,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);
}