Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-6017 obd: remove destroy cookie handling
[fs/lustre-release.git]
/
lustre
/
llite
/
lcommon_misc.c
diff --git
a/lustre/llite/lcommon_misc.c
b/lustre/llite/lcommon_misc.c
index
05a670d
..
a0b0260
100644
(file)
--- a/
lustre/llite/lcommon_misc.c
+++ b/
lustre/llite/lcommon_misc.c
@@
-52,13
+52,13
@@
static int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)
{
struct lov_stripe_md lsm = { .lsm_magic = LOV_MAGIC_V3 };
__u32 valsize = sizeof(struct lov_desc);
- int rc, easize, def_easize
, cookiesize
;
+ int rc, easize, def_easize;
struct lov_desc desc;
__u16 stripes, def_stripes;
ENTRY;
-
rc = obd_get_info(NULL, dt_exp, sizeof(KEY_LOVDESC), KEY_LOVDESC,
-
&valsize, &desc, NULL
);
+ rc = obd_get_info(NULL, dt_exp, sizeof(KEY_LOVDESC), KEY_LOVDESC,
+
&valsize, &desc
);
if (rc)
RETURN(rc);
@@
-71,15
+71,9
@@
static int cl_init_ea_size(struct obd_export *md_exp, struct obd_export *dt_exp)
lsm.lsm_stripe_count = def_stripes;
def_easize = obd_size_diskmd(dt_exp, &lsm);
-
cookiesize = stripes * sizeof(struct llog_cooki
e);
+
CDEBUG(D_HA, "updating def/max_easize: %d/%d\n", def_easize, easiz
e);
- /* default cookiesize is 0 because from 2.4 server doesn't send
- * llog cookies to client. */
- CDEBUG(D_HA,
- "updating def/max_easize: %d/%d def/max_cookiesize: 0/%d\n",
- def_easize, easize, cookiesize);
-
- rc = md_init_ea_size(md_exp, easize, def_easize, cookiesize, 0);
+ rc = md_init_ea_size(md_exp, easize, def_easize);
RETURN(rc);
}