From 93e2795aa9c08f4ec4a73af0f7d051ddb5a4ab42 Mon Sep 17 00:00:00 2001 From: Mikhail Pershin Date: Wed, 3 Oct 2012 11:46:59 +0400 Subject: [PATCH] LU-1574 osd: don't use obd_name but od_svname in error messages obd_name is not initialized in OSD, but there is od_svname in osd_device to be used instead. Signed-off-by: Mikhail Pershin Change-Id: I87a83badc358ad508ecb8a4e593a7e744277e57f Reviewed-on: http://review.whamcloud.com/4165 Tested-by: Hudson Reviewed-by: Johann Lombardi Reviewed-by: Andreas Dilger Tested-by: Maloo --- lustre/osd-ldiskfs/osd_quota.c | 2 +- lustre/osd-zfs/osd_handler.c | 5 ++--- lustre/osd-zfs/osd_index.c | 6 +++--- lustre/osd-zfs/osd_quota.c | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lustre/osd-ldiskfs/osd_quota.c b/lustre/osd-ldiskfs/osd_quota.c index 8dbe02b..5cfd1f5 100644 --- a/lustre/osd-ldiskfs/osd_quota.c +++ b/lustre/osd-ldiskfs/osd_quota.c @@ -120,7 +120,7 @@ static int osd_acct_index_lookup(const struct lu_env *env, #define QUOTA_IT_READ_ERROR(it, rc) \ CERROR("%s: Error while trying to read quota information, " \ "failed with %d\n", \ - it->oiq_obj->oo_dt.do_lu.lo_dev->ld_obd->obd_name, rc); \ + osd_dev(it->oiq_obj->oo_dt.do_lu.lo_dev)->od_svname, rc); \ /** * Initialize osd Iterator for given osd index object. diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c index 6da92fa..9f0c539 100644 --- a/lustre/osd-zfs/osd_handler.c +++ b/lustre/osd-zfs/osd_handler.c @@ -209,11 +209,10 @@ static int osd_trans_start(const struct lu_env *env, struct dt_device *d, if (!lu_device_is_md(&d->dd_lu_dev) && rc == -ENOSPC) CERROR("%s: failed to start transaction due to ENOSPC. " "Metadata overhead is underestimated or " - "grant_ratio is too low.\n", - osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name); + "grant_ratio is too low.\n", osd->od_svname); else CERROR("%s: can't assign tx: rc = %d\n", - osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name, rc); + osd->od_svname, rc); } else { /* add commit callback */ dmu_tx_callback_register(oh->ot_tx, osd_trans_commit_cb, oh); diff --git a/lustre/osd-zfs/osd_index.c b/lustre/osd-zfs/osd_index.c index d9195a5..73d02a4 100644 --- a/lustre/osd-zfs/osd_index.c +++ b/lustre/osd-zfs/osd_index.c @@ -468,18 +468,18 @@ struct osd_object *osd_object_find(const struct lu_env *env, else LU_OBJECT_DEBUG(D_ERROR, env, luch, "%s: object can't be located "DFID"\n", - ludev->ld_obd->obd_name, PFID(fid)); + osd_dev(ludev)->od_svname, PFID(fid)); if (child == NULL) { lu_object_put(env, luch); CERROR("%s: Unable to get osd_object "DFID"\n", - ludev->ld_obd->obd_name, PFID(fid)); + osd_dev(ludev)->od_svname, PFID(fid)); child = ERR_PTR(-ENOENT); } } else { LU_OBJECT_DEBUG(D_ERROR, env, luch, "%s: lu_object does not exists "DFID"\n", - ludev->ld_obd->obd_name, PFID(fid)); + osd_dev(ludev)->od_svname, PFID(fid)); lu_object_put(env, luch); child = ERR_PTR(-ENOENT); } diff --git a/lustre/osd-zfs/osd_quota.c b/lustre/osd-zfs/osd_quota.c index 3c2fa2b..5470d94 100644 --- a/lustre/osd-zfs/osd_quota.c +++ b/lustre/osd-zfs/osd_quota.c @@ -96,7 +96,7 @@ static int osd_acct_index_lookup(const struct lu_env *env, if (rc == -ENOENT) /* user/group has not created anything yet */ CDEBUG(D_QUOTA, "%s: id %s not found in DMU accounting ZAP\n", - osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name, buf); + osd->od_svname, buf); else if (rc) RETURN(rc); @@ -115,7 +115,7 @@ static int osd_acct_index_lookup(const struct lu_env *env, if (rc == -ENOENT) /* user/group has not created any file yet */ CDEBUG(D_QUOTA, "%s: id %s not found in accounting ZAP\n", - osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name, buf); + osd->od_svname, buf); else if (rc) RETURN(rc); @@ -286,7 +286,7 @@ static int osd_it_acct_rec(const struct lu_env *env, if (rc == -ENOENT) /* user/group has not created any file yet */ CDEBUG(D_QUOTA, "%s: id %s not found in accounting ZAP\n", - osd->od_dt_dev.dd_lu_dev.ld_obd->obd_name, buf); + osd->od_svname, buf); else if (rc) RETURN(rc); -- 1.8.3.1