From: Maxim Patlasov Date: Mon, 23 Aug 2010 09:52:06 +0000 (+0400) Subject: b=22407 substitute %i with %d X-Git-Tag: 2.0.51.0~26 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=48d29ff71de18d8d375b072a7287ba9ecdb6cdce b=22407 substitute %i with %d i=alex Common in-kernel code should use %d intstead of %i in print format strings because solaris native prims (like cmn_err()) don't support %i. --- diff --git a/libcfs/libcfs/tracefile.c b/libcfs/libcfs/tracefile.c index dbdb896..b7439e9 100644 --- a/libcfs/libcfs/tracefile.c +++ b/libcfs/libcfs/tracefile.c @@ -313,7 +313,7 @@ int libcfs_debug_vmsg2(cfs_debug_limit_state_t *cdls, int subsys, int mask, max_nob = CFS_PAGE_SIZE - tage->used - known_size; if (max_nob <= 0) { - printk(CFS_KERN_EMERG "negative max_nob: %i\n", + printk(CFS_KERN_EMERG "negative max_nob: %d\n", max_nob); mask |= D_ERROR; cfs_trace_put_tcd(tcd); diff --git a/lustre/cmm/mdc_device.c b/lustre/cmm/mdc_device.c index 0f5ad10..416233d 100644 --- a/lustre/cmm/mdc_device.c +++ b/lustre/cmm/mdc_device.c @@ -326,7 +326,7 @@ static struct lu_device *mdc_device_free(const struct lu_env *env, struct mdc_device *mc = lu2mdc_dev(ld); LASSERTF(cfs_atomic_read(&ld->ld_ref) == 0, - "Refcount = %i\n", cfs_atomic_read(&ld->ld_ref)); + "Refcount = %d\n", cfs_atomic_read(&ld->ld_ref)); LASSERT(cfs_list_empty(&mc->mc_linkage)); md_device_fini(&mc->mc_md_dev); OBD_FREE_PTR(mc); diff --git a/lustre/lclient/lcommon_cl.c b/lustre/lclient/lcommon_cl.c index 6159d3f..9f7d9a3 100644 --- a/lustre/lclient/lcommon_cl.c +++ b/lustre/lclient/lcommon_cl.c @@ -682,7 +682,7 @@ void ccc_lock_state(const struct lu_env *env, cl_inode_atime(inode) = attr->cat_atime; cl_inode_ctime(inode) = attr->cat_ctime; } else { - CL_LOCK_DEBUG(D_INFO, env, lock, "attr_get: %i\n", rc); + CL_LOCK_DEBUG(D_INFO, env, lock, "attr_get: %d\n", rc); } cl_object_attr_unlock(obj); cl_isize_unlock(inode, 0); @@ -714,7 +714,7 @@ int ccc_io_one_lock_index(const struct lu_env *env, struct cl_io *io, CLOBINVRNT(env, obj, ccc_object_invariant(obj)); ENTRY; - CDEBUG(D_VFSTRACE, "lock: %i [%lu, %lu]\n", mode, start, end); + CDEBUG(D_VFSTRACE, "lock: %d [%lu, %lu]\n", mode, start, end); memset(&cio->cui_link, 0, sizeof cio->cui_link); diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index 1cc8f9f..44b6130 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -2397,7 +2397,7 @@ int ldlm_error2errno(ldlm_error_t error) if (((int)error) < 0) /* cast to signed type */ result = error; /* as ldlm_error_t can be unsigned */ else { - CERROR("Invalid DLM result code: %i\n", error); + CERROR("Invalid DLM result code: %d\n", error); result = -EPROTO; } } diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c index 6e30f40..ae43a07 100644 --- a/lustre/llite/llite_mmap.c +++ b/lustre/llite/llite_mmap.c @@ -166,7 +166,7 @@ int ll_fault_io_init(struct vm_area_struct *vma, struct lu_env **env_ret, vma->vm_flags &= ~VM_SEQ_READ; vma->vm_flags |= VM_RAND_READ; - CDEBUG(D_INFO, "vm_flags: %lx (%lu %i %i)\n", vma->vm_flags, + CDEBUG(D_INFO, "vm_flags: %lx (%lu %d %d)\n", vma->vm_flags, fio->ft_index, fio->ft_writable, fio->ft_executable); if (cl_io_init(env, io, CIT_FAULT, io->ci_obj) == 0) { diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c index 4c6da36..de4e322 100644 --- a/lustre/llite/rw.c +++ b/lustre/llite/rw.c @@ -214,7 +214,7 @@ static struct ll_cl_context *ll_cl_init(struct file *file, lcc = ERR_PTR(result); } - CDEBUG(D_VFSTRACE, "%lu@"DFID" -> %i %p %p\n", + CDEBUG(D_VFSTRACE, "%lu@"DFID" -> %d %p %p\n", vmpage->index, PFID(lu_object_fid(&clob->co_lu)), result, env, io); return lcc; diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c index ff9f4d2..7c8a604 100644 --- a/lustre/llite/vvp_io.c +++ b/lustre/llite/vvp_io.c @@ -181,7 +181,7 @@ static int vvp_mmap_locks(const struct lu_env *env, descr->cld_enq_flags = flags; result = cl_io_lock_alloc_add(env, io, descr); - CDEBUG(D_VFSTRACE, "lock: %i: [%lu, %lu]\n", + CDEBUG(D_VFSTRACE, "lock: %d: [%lu, %lu]\n", descr->cld_mode, descr->cld_start, descr->cld_end); @@ -773,7 +773,7 @@ static int vvp_io_read_page(const struct lu_env *env, /* Sanity check whether the page is protected by a lock. */ rc = cl_page_is_under_lock(env, io, page); if (rc != -EBUSY) { - CL_PAGE_HEADER(D_WARNING, env, page, "%s: %i\n", + CL_PAGE_HEADER(D_WARNING, env, page, "%s: %d\n", rc == -ENODATA ? "without a lock" : "match failed", rc); if (rc != -ENODATA) diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c index 7d16160..5bc1863 100644 --- a/lustre/llite/vvp_object.c +++ b/lustre/llite/vvp_object.c @@ -64,13 +64,13 @@ static int vvp_object_print(const struct lu_env *env, void *cookie, struct inode *inode = obj->cob_inode; struct ll_inode_info *lli; - (*p)(env, cookie, "(%s %i %i) inode: %p ", + (*p)(env, cookie, "(%s %d %d) inode: %p ", cfs_list_empty(&obj->cob_pending_list) ? "-" : "+", obj->cob_transient_pages, cfs_atomic_read(&obj->cob_mmap_cnt), inode); if (inode) { lli = ll_i2info(inode); - (*p)(env, cookie, "%lu/%u %o %u %i %p "DFID, + (*p)(env, cookie, "%lu/%u %o %u %d %p "DFID, inode->i_ino, inode->i_generation, inode->i_mode, inode->i_nlink, atomic_read(&inode->i_count), lli->lli_clob, PFID(&lli->lli_fid)); diff --git a/lustre/lov/lov_io.c b/lustre/lov/lov_io.c index 6591bda..1f72ad6 100644 --- a/lustre/lov/lov_io.c +++ b/lustre/lov/lov_io.c @@ -392,7 +392,7 @@ static int lov_io_iter_init(const struct lu_env *env, start, end); rc = cl_io_iter_init(sub->sub_env, sub->sub_io); lov_sub_put(sub); - CDEBUG(D_VFSTRACE, "shrink: %i ["LPU64", "LPU64")\n", + CDEBUG(D_VFSTRACE, "shrink: %d ["LPU64", "LPU64")\n", stripe, start, end); } else rc = PTR_ERR(sub); diff --git a/lustre/lov/lov_lock.c b/lustre/lov/lov_lock.c index 9924015..6ef27ee 100644 --- a/lustre/lov/lov_lock.c +++ b/lustre/lov/lov_lock.c @@ -1050,7 +1050,7 @@ static int lov_lock_fits_into(const struct lu_env *env, * match against original lock extent. */ result = cl_lock_ext_match(&lov->lls_orig, need); - CDEBUG(D_DLMTRACE, DDESCR"/"DDESCR" %i %i/%i: %i\n", + CDEBUG(D_DLMTRACE, DDESCR"/"DDESCR" %d %d/%d: %d\n", PDESCR(&lov->lls_orig), PDESCR(&lov->lls_sub[0].sub_got), lov->lls_sub[0].sub_stripe, lov->lls_nr, lov_r0(obj)->lo_nr, result); diff --git a/lustre/lov/lov_log.c b/lustre/lov/lov_log.c index c3d6c10..3f5f9693 100644 --- a/lustre/lov/lov_log.c +++ b/lustre/lov/lov_log.c @@ -119,7 +119,7 @@ static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, numcookies - cookies); llog_ctxt_put(cctxt); if (rc < 0) { - CERROR("Can't add llog (rc = %d) for stripe %i\n", + CERROR("Can't add llog (rc = %d) for stripe %d\n", rc, cookies); memset(logcookies + cookies, 0, sizeof(struct llog_cookie)); diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c index 658b34d..c0857d4 100644 --- a/lustre/lov/lov_object.c +++ b/lustre/lov/lov_object.c @@ -152,7 +152,7 @@ static int lov_init_sub(const struct lu_env *env, struct lov_object *lov, r0->lo_sub[idx]->lso_index = idx; result = 0; } else { - CERROR("Stripe is already owned by other file (%i).\n", idx); + CERROR("Stripe is already owned by other file (%d).\n", idx); LU_OBJECT_DEBUG(D_ERROR, env, &stripe->co_lu, "\n"); LU_OBJECT_DEBUG(D_ERROR, env, lu_object_top(&parent->coh_lu), "old\n"); diff --git a/lustre/lov/lovsub_lock.c b/lustre/lov/lovsub_lock.c index a0f3406..f7d54ba 100644 --- a/lustre/lov/lovsub_lock.c +++ b/lustre/lov/lovsub_lock.c @@ -379,7 +379,7 @@ static int lovsub_lock_delete_one(const struct lu_env *env, case CLS_HELD: CL_LOCK_DEBUG(D_ERROR, env, parent, "Delete CLS_HELD lock\n"); default: - CERROR("Impossible state: %i\n", parent->cll_state); + CERROR("Impossible state: %d\n", parent->cll_state); LBUG(); break; } diff --git a/lustre/lov/lovsub_object.c b/lustre/lov/lovsub_object.c index 7793074..a0b5da3 100644 --- a/lustre/lov/lovsub_object.c +++ b/lustre/lov/lovsub_object.c @@ -101,7 +101,7 @@ static int lovsub_object_print(const struct lu_env *env, void *cookie, { struct lovsub_object *los = lu2lovsub(obj); - return (*p)(env, cookie, "[%i]", los->lso_index); + return (*p)(env, cookie, "[%d]", los->lso_index); } static int lovsub_attr_set(const struct lu_env *env, struct cl_object *obj, diff --git a/lustre/mdt/mdt_recovery.c b/lustre/mdt/mdt_recovery.c index 61721c0..a8327bb 100644 --- a/lustre/mdt/mdt_recovery.c +++ b/lustre/mdt/mdt_recovery.c @@ -841,7 +841,7 @@ static int mdt_txn_stop_cb(const struct lu_env *env, cfs_spin_lock(&mdt->mdt_lut.lut_translock); if (txn->th_result != 0) { if (mti->mti_transno != 0) { - CERROR("Replay transno "LPU64" failed: rc %i\n", + CERROR("Replay transno "LPU64" failed: rc %d\n", mti->mti_transno, txn->th_result); } } else if (mti->mti_transno == 0) { diff --git a/lustre/obdclass/cl_io.c b/lustre/obdclass/cl_io.c index db2e6e6..3b9b876 100644 --- a/lustre/obdclass/cl_io.c +++ b/lustre/obdclass/cl_io.c @@ -345,7 +345,7 @@ static int cl_queue_merge(const cfs_list_t *queue, if (cl_lock_descr_cmp(&scan->cill_descr, need)) continue; cl_lock_descr_merge(&scan->cill_descr, need); - CDEBUG(D_VFSTRACE, "lock: %i: [%lu, %lu]\n", + CDEBUG(D_VFSTRACE, "lock: %d: [%lu, %lu]\n", scan->cill_descr.cld_mode, scan->cill_descr.cld_start, scan->cill_descr.cld_end); RETURN(+1); diff --git a/lustre/obdclass/cl_lock.c b/lustre/obdclass/cl_lock.c index ad244e4..5b3767b 100644 --- a/lustre/obdclass/cl_lock.c +++ b/lustre/obdclass/cl_lock.c @@ -132,8 +132,8 @@ static void cl_lock_trace0(int level, const struct lu_env *env, const char *func, const int line) { struct cl_object_header *h = cl_object_header(lock->cll_descr.cld_obj); - CDEBUG(level, "%s: %p@(%i %p %i %d %d %d %d %lx)" - "(%p/%d/%i) at %s():%d\n", + CDEBUG(level, "%s: %p@(%d %p %d %d %d %d %d %lx)" + "(%p/%d/%d) at %s():%d\n", prefix, lock, cfs_atomic_read(&lock->cll_ref), lock->cll_guarder, lock->cll_depth, lock->cll_state, lock->cll_error, lock->cll_holds, @@ -519,7 +519,7 @@ static struct cl_lock *cl_lock_lookup(const struct lu_env *env, lock->cll_error == 0 && !(lock->cll_flags & CLF_CANCELLED) && cl_lock_fits_into(env, lock, need, io); - CDEBUG(D_DLMTRACE, "has: "DDESCR"(%i) need: "DDESCR": %d\n", + CDEBUG(D_DLMTRACE, "has: "DDESCR"(%d) need: "DDESCR": %d\n", PDESCR(&lock->cll_descr), lock->cll_state, PDESCR(need), matched); if (matched) { diff --git a/lustre/obdclass/cl_object.c b/lustre/obdclass/cl_object.c index 88f3cfd..9616efa 100644 --- a/lustre/obdclass/cl_object.c +++ b/lustre/obdclass/cl_object.c @@ -748,7 +748,7 @@ struct lu_env *cl_env_peek(int *refcheck) env = &cle->ce_lu; *refcheck = ++cle->ce_ref; } - CDEBUG(D_OTHER, "%i@%p\n", cle ? cle->ce_ref : 0, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle ? cle->ce_ref : 0, cle); return env; } EXPORT_SYMBOL(cl_env_peek); @@ -779,7 +779,7 @@ struct lu_env *cl_env_get(int *refcheck) cle = cl_env_container(env); cl_env_attach(cle); *refcheck = cle->ce_ref; - CDEBUG(D_OTHER, "%i@%p\n", cle->ce_ref, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle); } } return env; @@ -802,7 +802,7 @@ struct lu_env *cl_env_alloc(int *refcheck, __u32 tags) cle = cl_env_container(env); *refcheck = cle->ce_ref; - CDEBUG(D_OTHER, "%i@%p\n", cle->ce_ref, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle); } return env; } @@ -858,7 +858,7 @@ void cl_env_put(struct lu_env *env, int *refcheck) LASSERT(cle->ce_ref > 0); LASSERT(ergo(refcheck != NULL, cle->ce_ref == *refcheck)); - CDEBUG(D_OTHER, "%i@%p\n", cle->ce_ref, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle); if (--cle->ce_ref == 0) { CL_ENV_DEC(cs_busy); cl_env_detach(cle); @@ -919,7 +919,7 @@ void cl_env_implant(struct lu_env *env, int *refcheck) cl_env_attach(cle); cl_env_get(refcheck); - CDEBUG(D_OTHER, "%i@%p\n", cle->ce_ref, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle); } EXPORT_SYMBOL(cl_env_implant); @@ -932,7 +932,7 @@ void cl_env_unplant(struct lu_env *env, int *refcheck) LASSERT(cle->ce_ref > 1); - CDEBUG(D_OTHER, "%i@%p\n", cle->ce_ref, cle); + CDEBUG(D_OTHER, "%d@%p\n", cle->ce_ref, cle); cl_env_detach(cle); cl_env_put(env, refcheck); diff --git a/lustre/obdclass/cl_page.c b/lustre/obdclass/cl_page.c index c56b73b..79b7b1b 100644 --- a/lustre/obdclass/cl_page.c +++ b/lustre/obdclass/cl_page.c @@ -411,7 +411,7 @@ static struct cl_page *cl_page_find0(const struct lu_env *env, hdr = cl_object_header(o); cfs_atomic_inc(&site->cs_pages.cs_lookup); - CDEBUG(D_PAGE, "%lu@"DFID" %p %lu %i\n", + CDEBUG(D_PAGE, "%lu@"DFID" %p %lu %d\n", idx, PFID(&hdr->coh_lu.loh_fid), vmpage, vmpage->private, type); /* fast path. */ if (type == CPT_CACHEABLE) { @@ -610,7 +610,7 @@ static void cl_page_state_set0(const struct lu_env *env, ENTRY; old = page->cp_state; PASSERT(env, page, allowed_transitions[old][state]); - CL_PAGE_HEADER(D_TRACE, env, page, "%i -> %i\n", old, state); + CL_PAGE_HEADER(D_TRACE, env, page, "%d -> %d\n", old, state); for (; page != NULL; page = page->cp_child) { PASSERT(env, page, page->cp_state == old); PASSERT(env, page, @@ -664,7 +664,7 @@ void cl_page_put(const struct lu_env *env, struct cl_page *page) PASSERT(env, page, cfs_atomic_read(&page->cp_ref) > !!page->cp_parent); ENTRY; - CL_PAGE_HEADER(D_TRACE, env, page, "%i\n", + CL_PAGE_HEADER(D_TRACE, env, page, "%d\n", cfs_atomic_read(&page->cp_ref)); hdr = cl_object_header(cl_object_top(page->cp_obj)); @@ -1335,7 +1335,7 @@ int cl_page_prep(const struct lu_env *env, struct cl_io *io, KLASSERT(ergo(crt == CRT_WRITE && pg->cp_type == CPT_CACHEABLE, equi(result == 0, PageWriteback(cl_page_vmpage(env, pg))))); - CL_PAGE_HEADER(D_TRACE, env, pg, "%i %i\n", crt, result); + CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", crt, result); return result; } EXPORT_SYMBOL(cl_page_prep); @@ -1367,7 +1367,7 @@ void cl_page_completion(const struct lu_env *env, PINVRNT(env, pg, cl_page_invariant(pg)); ENTRY; - CL_PAGE_HEADER(D_TRACE, env, pg, "%i %i\n", crt, ioret); + CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", crt, ioret); if (crt == CRT_READ && ioret == 0) { PASSERT(env, pg, !(pg->cp_flags & CPF_READ_COMPLETED)); pg->cp_flags |= CPF_READ_COMPLETED; @@ -1417,7 +1417,7 @@ int cl_page_make_ready(const struct lu_env *env, struct cl_page *pg, PASSERT(env, pg, pg->cp_state == CPS_CACHED); cl_page_io_start(env, pg, crt); } - CL_PAGE_HEADER(D_TRACE, env, pg, "%i %i\n", crt, result); + CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", crt, result); RETURN(result); } EXPORT_SYMBOL(cl_page_make_ready); @@ -1450,7 +1450,7 @@ int cl_page_cache_add(const struct lu_env *env, struct cl_io *io, cl_page_owner_clear(pg); cl_page_state_set(env, pg, CPS_CACHED); } - CL_PAGE_HEADER(D_TRACE, env, pg, "%i %i\n", crt, result); + CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", crt, result); RETURN(result); } EXPORT_SYMBOL(cl_page_cache_add); @@ -1539,7 +1539,7 @@ void cl_page_clip(const struct lu_env *env, struct cl_page *pg, { PINVRNT(env, pg, cl_page_invariant(pg)); - CL_PAGE_HEADER(D_TRACE, env, pg, "%i %i\n", from, to); + CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", from, to); CL_PAGE_INVOID(env, pg, CL_PAGE_OP(cpo_clip), (const struct lu_env *, const struct cl_page_slice *,int, int), diff --git a/lustre/obdclass/lu_object.c b/lustre/obdclass/lu_object.c index 8a86fa5..72ae1cc 100644 --- a/lustre/obdclass/lu_object.c +++ b/lustre/obdclass/lu_object.c @@ -1510,7 +1510,7 @@ void lu_context_keys_dump(void) key = lu_keys[i]; if (key != NULL) { - CERROR("[%i]: %p %x (%p,%p,%p) %i %i \"%s\"@%p\n", + CERROR("[%d]: %p %x (%p,%p,%p) %d %d \"%s\"@%p\n", i, key, key->lct_tags, key->lct_init, key->lct_fini, key->lct_exit, key->lct_index, cfs_atomic_read(&key->lct_used), diff --git a/lustre/obdclass/lu_ref.c b/lustre/obdclass/lu_ref.c index fdaac5f..aa2c366 100644 --- a/lustre/obdclass/lu_ref.c +++ b/lustre/obdclass/lu_ref.c @@ -239,7 +239,7 @@ static struct lu_ref_link *lu_ref_find(struct lu_ref *ref, const char *scope, ++iterations; if (lu_ref_link_eq(link, scope, source)) { if (iterations > lu_ref_chain_max_length) { - CWARN("Long lu_ref chain %i \"%s\":%p\n", + CWARN("Long lu_ref chain %d \"%s\":%p\n", iterations, scope, source); lu_ref_chain_max_length = iterations * 3 / 2; } diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c index fc1e38c..9e77fc6 100644 --- a/lustre/osc/osc_io.c +++ b/lustre/osc/osc_io.c @@ -127,7 +127,7 @@ static int osc_io_submit(const struct lu_env *env, LASSERT(qin->pl_nr > 0); - CDEBUG(D_INFO, "%i %i\n", qin->pl_nr, crt); + CDEBUG(D_INFO, "%d %d\n", qin->pl_nr, crt); /* * NOTE: here @page is a top-level page. This is done to avoid * creation of sub-page-list. @@ -221,7 +221,7 @@ static int osc_io_submit(const struct lu_env *env, if (queued > 0) osc_io_unplug(env, osc, cli); - CDEBUG(D_INFO, "%i/%i %i\n", qin->pl_nr, qout->pl_nr, result); + CDEBUG(D_INFO, "%d/%d %d\n", qin->pl_nr, qout->pl_nr, result); return qout->pl_nr > 0 ? 0 : result; } @@ -344,7 +344,7 @@ static int osc_io_fault_start(const struct lu_env *env, io = ios->cis_io; fio = &io->u.ci_fault; - CDEBUG(D_INFO, "%lu %i %i\n", + CDEBUG(D_INFO, "%lu %d %d\n", fio->ft_index, fio->ft_writable, fio->ft_nob); /* * If mapping is writeable, adjust kms to cover this page, @@ -415,7 +415,7 @@ static void osc_trunc_check(const struct lu_env *env, struct cl_io *io, /* * XXX Linux specific debugging stuff. */ - CL_PAGE_DEBUG(D_ERROR, env, page, "%s/%i %lu\n", + CL_PAGE_DEBUG(D_ERROR, env, page, "%s/%d %lu\n", submitter->comm, submitter->pid, start); libcfs_debug_dumpstack(submitter); } diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c index 254d02e..73f6083 100644 --- a/lustre/osc/osc_lock.c +++ b/lustre/osc/osc_lock.c @@ -506,7 +506,7 @@ static int osc_lock_upcall(void *cookie, int errcode) } else if (olck->ols_state == OLS_CANCELLED) { rc = -EIO; } else { - CERROR("Impossible state: %i\n", olck->ols_state); + CERROR("Impossible state: %d\n", olck->ols_state); LBUG(); } if (rc) { diff --git a/lustre/osd-ldiskfs/osd_iam.c b/lustre/osd-ldiskfs/osd_iam.c index 290cf29..7655f50 100644 --- a/lustre/osd-ldiskfs/osd_iam.c +++ b/lustre/osd-ldiskfs/osd_iam.c @@ -1643,7 +1643,7 @@ static int iam_shift_entries(struct iam_path *path, count2 = count - count1; dx_get_ikey(path, iam_entry_shift(path, entries, count1), pivot); - dxtrace(printk("Split index %i/%i\n", count1, count2)); + dxtrace(printk("Split index %d/%d\n", count1, count2)); memcpy((char *) iam_entry_shift(path, entries2, delta), (char *) iam_entry_shift(path, entries, count1), diff --git a/lustre/osd-ldiskfs/osd_iam_lfix.c b/lustre/osd-ldiskfs/osd_iam_lfix.c index 0f7081e..4a46d6f 100644 --- a/lustre/osd-ldiskfs/osd_iam_lfix.c +++ b/lustre/osd-ldiskfs/osd_iam_lfix.c @@ -184,7 +184,7 @@ static int iam_lfix_init(struct iam_leaf *l) obj = iam_leaf_container(l)->ic_object; CERROR("Wrong magic in node %llu (#%lu): %#x != %#x or " - "wrong count: %i (%i)\n", + "wrong count: %d (%d)\n", (unsigned long long)l->il_bh->b_blocknr, obj->i_ino, ill->ill_magic, le16_to_cpu(IAM_LEAF_HEADER_MAGIC), count, leaf_count_limit(l)); diff --git a/lustre/osd-ldiskfs/osd_iam_lvar.c b/lustre/osd-ldiskfs/osd_iam_lvar.c index 1051d4b..437f164 100644 --- a/lustre/osd-ldiskfs/osd_iam_lvar.c +++ b/lustre/osd-ldiskfs/osd_iam_lvar.c @@ -408,7 +408,7 @@ static int lvar_init(struct iam_leaf *l) obj = iam_leaf_container(l)->ic_object; CERROR("Wrong magic in node %llu (#%lu): %#x != %#x or " - "wrong used: %i", + "wrong used: %d", (unsigned long long)l->il_bh->b_blocknr, obj->i_ino, head->vlh_magic, le16_to_cpu(IAM_LVAR_LEAF_MAGIC), used); diff --git a/lustre/ptlrpc/target.c b/lustre/ptlrpc/target.c index d402923..e7ea1f5 100644 --- a/lustre/ptlrpc/target.c +++ b/lustre/ptlrpc/target.c @@ -293,7 +293,7 @@ void lut_boot_epoch_update(struct lu_target *lut) rc = lu_env_init(&env, LCT_DT_THREAD); if (rc) { - CERROR("Can't initialize environment rc=%i\n", rc); + CERROR("Can't initialize environment rc=%d\n", rc); return; }