if (ioc_data && (ioc_data->ioc_inllen1)) {
l = 0;
remains = ioc_data->ioc_inllen4 +
- size_round(ioc_data->ioc_inllen1) +
- size_round(ioc_data->ioc_inllen2) +
- size_round(ioc_data->ioc_inllen3);
+ cfs_size_round(ioc_data->ioc_inllen1) +
+ cfs_size_round(ioc_data->ioc_inllen2) +
+ cfs_size_round(ioc_data->ioc_inllen3);
from = simple_strtol(ioc_data->ioc_inlbuf2, &endp, 0);
if (*endp != '\0')
RETURN(-EINVAL);
case OST_RAID1_REC:
case MDS_UNLINK_REC:
case MDS_SETATTR_REC:
+ case MDS_SETATTR64_REC:
case OBD_CFG_REC:
case LLOG_HDR_MAGIC: {
l = snprintf(out, remains, "[index]: %05d [type]: "
if (ioc_data->ioc_inllen1) {
l = 0;
remains = ioc_data->ioc_inllen4 +
- size_round(ioc_data->ioc_inllen1) +
- size_round(ioc_data->ioc_inllen2) +
- size_round(ioc_data->ioc_inllen3);
+ cfs_size_round(ioc_data->ioc_inllen1) +
+ cfs_size_round(ioc_data->ioc_inllen2) +
+ cfs_size_round(ioc_data->ioc_inllen3);
from = simple_strtol(ioc_data->ioc_inlbuf2, &endp, 0);
if (*endp != '\0')
RETURN(-EINVAL);
int rc, index = 0;
ENTRY;
- down_write(&cat->lgh_lock);
+ cfs_down_write(&cat->lgh_lock);
rc = llog_cat_id2handle(cat, &log, logid);
if (rc) {
CDEBUG(D_IOCTL, "cannot find log #"LPX64"#"LPX64"#%08x\n",
rc = llog_cancel_rec(cat, index);
out:
llog_free_handle(log);
- up_write(&cat->lgh_lock);
+ cfs_up_write(&cat->lgh_lock);
RETURN(rc);
}
case OBD_IOC_LLOG_INFO: {
int l;
int remains = data->ioc_inllen2 +
- size_round(data->ioc_inllen1);
+ cfs_size_round(data->ioc_inllen1);
char *out = data->ioc_bulk;
l = snprintf(out, remains,
GOTO(out_close, err = -EINVAL);
if (handle->lgh_hdr->llh_flags & LLOG_F_IS_CAT) {
- down_write(&handle->lgh_lock);
+ cfs_down_write(&handle->lgh_lock);
err = llog_cancel_rec(handle, cookie.lgc_index);
- up_write(&handle->lgh_lock);
+ cfs_up_write(&handle->lgh_lock);
GOTO(out_close, err);
}
if (!idarray)
RETURN(-ENOMEM);
- rc = llog_get_cat_list(obd, obd, name, 0, count, idarray);
- if (rc) {
- OBD_FREE(idarray, size);
- RETURN(rc);
- }
+ cfs_mutex_down(&obd->obd_olg.olg_cat_processing);
+ rc = llog_get_cat_list(obd, name, 0, count, idarray);
+ if (rc)
+ GOTO(out, rc);
out = data->ioc_bulk;
remains = data->ioc_inllen1;
break;
}
}
+out:
+ /* release semaphore */
+ cfs_mutex_up(&obd->obd_olg.olg_cat_processing);
+
OBD_VFREE(idarray, size);
- RETURN(0);
+ RETURN(rc);
}
EXPORT_SYMBOL(llog_catalog_list);