CDEBUG(D_MGS, "OST index for %s is %u (%s)\n",
lustre_cfg_string(lcfg, 1), index,
lustre_cfg_string(lcfg, 2));
- cfs_set_bit(index, fsdb->fsdb_ost_index_map);
+ set_bit(index, fsdb->fsdb_ost_index_map);
}
/* Figure out mdt indicies */
}
rc = 0;
CDEBUG(D_MGS, "MDT index is %u\n", index);
- cfs_set_bit(index, fsdb->fsdb_mdt_index_map);
+ set_bit(index, fsdb->fsdb_mdt_index_map);
fsdb->fsdb_mdt_count ++;
}
/*
* compat to 1.8, check osc name used by MDT0 to OSTs, bz18548.
*/
- if (!cfs_test_bit(FSDB_OSCNAME18, &fsdb->fsdb_flags) &&
+ if (!test_bit(FSDB_OSCNAME18, &fsdb->fsdb_flags) &&
lcfg->lcfg_command == LCFG_ATTACH &&
strcmp(lustre_cfg_string(lcfg, 1), LUSTRE_OSC_NAME) == 0) {
if (OBD_OCD_VERSION_MAJOR(d->ver) == 1 &&
OBD_OCD_VERSION_MINOR(d->ver) <= 8) {
CWARN("MDT using 1.8 OSC name scheme\n");
- cfs_set_bit(FSDB_OSCNAME18, &fsdb->fsdb_flags);
+ set_bit(FSDB_OSCNAME18, &fsdb->fsdb_flags);
}
}
GOTO(out_close, rc);
if (llog_get_size(loghandle) <= 1)
- cfs_set_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags);
+ set_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags);
rc = llog_process(env, loghandle, mgs_fsdb_handler, (void *)&d, NULL);
CDEBUG(D_INFO, "get_db = %d\n", rc);
RETURN(NULL);
strcpy(fsdb->fsdb_name, fsname);
- cfs_mutex_init(&fsdb->fsdb_mutex);
- cfs_set_bit(FSDB_UDESC, &fsdb->fsdb_flags);
+ mutex_init(&fsdb->fsdb_mutex);
+ set_bit(FSDB_UDESC, &fsdb->fsdb_flags);
fsdb->fsdb_gen = 1;
if (strcmp(fsname, MGSSELF_NAME) == 0) {
- cfs_set_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags);
+ set_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags);
} else {
OBD_ALLOC(fsdb->fsdb_ost_index_map, INDEX_MAP_SIZE);
OBD_ALLOC(fsdb->fsdb_mdt_index_map, INDEX_MAP_SIZE);
static void mgs_free_fsdb(struct mgs_device *mgs, struct fs_db *fsdb)
{
/* wait for anyone with the sem */
- cfs_mutex_lock(&fsdb->fsdb_mutex);
+ mutex_lock(&fsdb->fsdb_mutex);
lproc_mgs_del_live(mgs, fsdb);
cfs_list_del(&fsdb->fsdb_list);
name_destroy(&fsdb->fsdb_clilov);
name_destroy(&fsdb->fsdb_clilmv);
mgs_free_fsdb_srpc(fsdb);
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
OBD_FREE_PTR(fsdb);
}
{
struct fs_db *fsdb;
cfs_list_t *tmp, *tmp2;
- cfs_mutex_lock(&mgs->mgs_mutex);
+ mutex_lock(&mgs->mgs_mutex);
cfs_list_for_each_safe(tmp, tmp2, &mgs->mgs_fs_db_list) {
fsdb = cfs_list_entry(tmp, struct fs_db, fsdb_list);
mgs_free_fsdb(mgs, fsdb);
}
- cfs_mutex_unlock(&mgs->mgs_mutex);
+ mutex_unlock(&mgs->mgs_mutex);
return 0;
}
int rc = 0;
ENTRY;
- cfs_mutex_lock(&mgs->mgs_mutex);
+ mutex_lock(&mgs->mgs_mutex);
fsdb = mgs_find_fsdb(mgs, name);
if (fsdb) {
- cfs_mutex_unlock(&mgs->mgs_mutex);
+ mutex_unlock(&mgs->mgs_mutex);
*dbh = fsdb;
RETURN(0);
}
fsdb = mgs_new_fsdb(env, mgs, name);
/* lock fsdb_mutex until the db is loaded from llogs */
if (fsdb)
- cfs_mutex_lock(&fsdb->fsdb_mutex);
- cfs_mutex_unlock(&mgs->mgs_mutex);
+ mutex_lock(&fsdb->fsdb_mutex);
+ mutex_unlock(&mgs->mgs_mutex);
if (!fsdb)
RETURN(-ENOMEM);
- if (!cfs_test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags)) {
+ if (!test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags)) {
/* populate the db from the client llog */
rc = mgs_get_fsdb_from_llog(env, mgs, fsdb);
if (rc) {
GOTO(out_free, rc);
}
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
*dbh = fsdb;
RETURN(0);
out_free:
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
mgs_free_fsdb(mgs, fsdb);
return rc;
}
RETURN(rc);
}
- if (cfs_test_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags))
+ if (test_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags))
RETURN(-1);
if (mti->mti_flags & LDD_F_SV_TYPE_OST)
else
RETURN(-EINVAL);
- if (cfs_test_bit(mti->mti_stripe_index, imap))
+ if (test_bit(mti->mti_stripe_index, imap))
RETURN(1);
RETURN(0);
}
{
int i;
for (i = 0; i < map_len * 8; i++)
- if (!cfs_test_bit(i, index_map)) {
+ if (!test_bit(i, index_map)) {
return i;
}
CERROR("max index %d exceeded.\n", i);
RETURN(rc);
}
- cfs_mutex_lock(&fsdb->fsdb_mutex);
+ mutex_lock(&fsdb->fsdb_mutex);
if (mti->mti_flags & LDD_F_SV_TYPE_OST) {
imap = fsdb->fsdb_ost_index_map;
} else if (mti->mti_flags & LDD_F_SV_TYPE_MDT) {
GOTO(out_up, rc = -ERANGE);
}
- if (cfs_test_bit(mti->mti_stripe_index, imap)) {
+ if (test_bit(mti->mti_stripe_index, imap)) {
if ((mti->mti_flags & LDD_F_VIRGIN) &&
!(mti->mti_flags & LDD_F_WRITECONF)) {
LCONSOLE_ERROR_MSG(0x140, "Server %s requested index "
}
}
- cfs_set_bit(mti->mti_stripe_index, imap);
- cfs_clear_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags);
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ set_bit(mti->mti_stripe_index, imap);
+ clear_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags);
+ mutex_unlock(&fsdb->fsdb_mutex);
server_make_name(mti->mti_flags & ~(LDD_F_VIRGIN | LDD_F_WRITECONF),
mti->mti_stripe_index, mti->mti_fsname, mti->mti_svname);
RETURN(0);
out_up:
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
return rc;
}
ENTRY;
- LASSERT(cfs_mutex_is_locked(&fsdb->fsdb_mutex));
+ LASSERT(mutex_is_locked(&fsdb->fsdb_mutex));
CDEBUG(D_MGS, "modify %s/%s/%s fl=%x\n", logname, devname, comment,
flags);
if (rc)
return rc;
/* COMPAT_180 */
- if (i == 0 && cfs_test_bit(FSDB_OSCNAME18, &fsdb->fsdb_flags))
+ if (i == 0 && test_bit(FSDB_OSCNAME18, &fsdb->fsdb_flags))
rc = name_create(lovname, fsdb->fsdb_name, "-mdtlov");
else
rc = name_create(lovname, *logname, "-mdtlov");
{
char suffix[16];
- if (i == 0 && cfs_test_bit(FSDB_OSCNAME18, &fsdb->fsdb_flags))
+ if (i == 0 && test_bit(FSDB_OSCNAME18, &fsdb->fsdb_flags))
sprintf(suffix, "-osc");
else
sprintf(suffix, "-osc-MDT%04x", i);
for (i = 0; i < INDEX_MAP_SIZE * 8; i++){
char *mdtname;
if (i != mti->mti_stripe_index &&
- cfs_test_bit(i, fsdb->fsdb_mdt_index_map)) {
+ test_bit(i, fsdb->fsdb_mdt_index_map)) {
rc = name_create_mdt(&mdtname, mti->mti_fsname, i);
if (rc)
GOTO(out_end, rc);
GOTO(out_free, rc);
/* for the system upgraded from old 1.8, keep using the old osc naming
* style for mdt, see name_create_mdt_osc(). LU-1257 */
- if (cfs_test_bit(FSDB_OSCNAME18, &fsdb->fsdb_flags))
+ if (test_bit(FSDB_OSCNAME18, &fsdb->fsdb_flags))
rc = name_create(&oscname, svname, "");
else
rc = name_create(&oscname, svname, suffix);
/* We also have to update the other logs where this osc is part of
the lov */
- if (cfs_test_bit(FSDB_OLDLOG14, &fsdb->fsdb_flags)) {
+ if (test_bit(FSDB_OLDLOG14, &fsdb->fsdb_flags)) {
/* If we're upgrading, the old mdt log already has our
entry. Let's do a fake one for fun. */
/* Note that we can't add any new failnids, since we don't
/* Add ost to all MDT lov defs */
for (i = 0; i < INDEX_MAP_SIZE * 8; i++){
- if (cfs_test_bit(i, fsdb->fsdb_mdt_index_map)) {
+ if (test_bit(i, fsdb->fsdb_mdt_index_map)) {
char mdt_index[9];
rc = name_create_mdt_and_lov(&logname, &lovname, fsdb,
int i;
for (i = 0; i < INDEX_MAP_SIZE * 8; i++) {
- if (!cfs_test_bit(i, fsdb->fsdb_mdt_index_map))
+ if (!test_bit(i, fsdb->fsdb_mdt_index_map))
continue;
rc = name_create_mdt(&logname, mti->mti_fsname, i);
if (rc)
goto error_out;
if (strcmp(ptr, "yes") == 0) {
- cfs_set_bit(FSDB_UDESC, &fsdb->fsdb_flags);
+ set_bit(FSDB_UDESC, &fsdb->fsdb_flags);
CWARN("Enable user descriptor shipping from client to MDT\n");
} else if (strcmp(ptr, "no") == 0) {
- cfs_clear_bit(FSDB_UDESC, &fsdb->fsdb_flags);
+ clear_bit(FSDB_UDESC, &fsdb->fsdb_flags);
CWARN("Disable user descriptor shipping from client to MDT\n");
} else {
*(ptr - 1) = '=';
RETURN(rc);
/* mgs rules implies must be mgc->mgs */
- if (cfs_test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags)) {
+ if (test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags)) {
if ((rule.sr_from != LUSTRE_SP_MGC &&
rule.sr_from != LUSTRE_SP_ANY) ||
(rule.sr_to != LUSTRE_SP_MGS &&
if (rc)
goto out_free;
- if (cfs_test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags)) {
+ if (test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags)) {
/*
* for mgs rules, make them effective immediately.
*/
/* Modify mdtlov */
/* Add to all MDT logs for CMD */
for (i = 0; i < INDEX_MAP_SIZE * 8; i++) {
- if (!cfs_test_bit(i, fsdb->fsdb_mdt_index_map))
+ if (!test_bit(i, fsdb->fsdb_mdt_index_map))
continue;
rc = name_create_mdt(&logname, mti->mti_fsname, i);
if (rc)
"changes were made to the "
"config log.\n",
mti->mti_svname, rc);
- if (cfs_test_bit(FSDB_OLDLOG14, &fsdb->fsdb_flags))
+ if (test_bit(FSDB_OLDLOG14, &fsdb->fsdb_flags))
LCONSOLE_ERROR_MSG(0x146, "This may be"
" because the log"
"is in the old 1.4"
(class_match_param(ptr, PARAM_LLITE, NULL) == 0)) {
char *cname;
- if (cfs_test_bit(FSDB_OLDLOG14, &fsdb->fsdb_flags)) {
+ if (test_bit(FSDB_OLDLOG14, &fsdb->fsdb_flags)) {
LCONSOLE_ERROR_MSG(0x148, "Upgraded client logs for %s"
" cannot be modified. Consider"
" updating the configuration with"
int i;
for (i = 0; i < INDEX_MAP_SIZE * 8; i++){
- if (!cfs_test_bit(i, fsdb->fsdb_mdt_index_map))
+ if (!test_bit(i, fsdb->fsdb_mdt_index_map))
continue;
name_destroy(&cname);
rc = name_create_mdt_osc(&cname, mti->mti_svname,
goto active_err;
if (rc & LDD_F_SV_ALL) {
for (i = 0; i < INDEX_MAP_SIZE * 8; i++) {
- if (!cfs_test_bit(i,
+ if (!test_bit(i,
fsdb->fsdb_mdt_index_map))
continue;
rc = name_create_mdt(&logname,
the failover list. Modify mti->params for rewriting back at
server_register_target(). */
- cfs_mutex_lock(&fsdb->fsdb_mutex);
+ mutex_lock(&fsdb->fsdb_mutex);
rc = mgs_write_log_add_failnid(obd, fsdb, mti);
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
RETURN(rc);
#endif
mti->mti_flags &= ~LDD_F_UPDATE;
}
- cfs_mutex_lock(&fsdb->fsdb_mutex);
+ mutex_lock(&fsdb->fsdb_mutex);
if (mti->mti_flags &
(LDD_F_VIRGIN | LDD_F_UPGRADE14 | LDD_F_WRITECONF)) {
OBD_FREE(buf, strlen(mti->mti_params) + 1);
out_up:
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
RETURN(rc);
}
if (rc)
RETURN(rc);
- cfs_mutex_lock(&mgs->mgs_mutex);
+ mutex_lock(&mgs->mgs_mutex);
/* Delete the fs db */
fsdb = mgs_find_fsdb(mgs, fsname);
if (fsdb)
mgs_free_fsdb(mgs, fsdb);
- cfs_mutex_unlock(&mgs->mgs_mutex);
+ mutex_unlock(&mgs->mgs_mutex);
cfs_list_for_each_entry_safe(dirent, n, &list, list) {
cfs_list_del(&dirent->list);
rc = mgs_find_or_make_fsdb(env, mgs, fsname, &fsdb);
if (rc)
RETURN(rc);
- if (!cfs_test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags) &&
- cfs_test_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags)) {
+ if (!test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags) &&
+ test_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags)) {
CERROR("No filesystem targets for %s. cfg_device from lctl "
"is '%s'\n", fsname, devname);
mgs_free_fsdb(mgs, fsdb);
mti->mti_flags = rc | LDD_F_PARAM;
- cfs_mutex_lock(&fsdb->fsdb_mutex);
+ mutex_lock(&fsdb->fsdb_mutex);
rc = mgs_write_log_param(env, mgs, fsdb, mti, mti->mti_params);
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
/*
* Revoke lock so everyone updates. Should be alright if
CERROR("Can't get db for %s\n", fsname);
RETURN(rc);
}
- if (cfs_test_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags)) {
+ if (test_bit(FSDB_LOG_EMPTY, &fsdb->fsdb_flags)) {
CERROR("%s is not defined\n", fsname);
mgs_free_fsdb(mgs, fsdb);
RETURN(-EINVAL);
break;
}
- cfs_mutex_lock(&fsdb->fsdb_mutex);
+ mutex_lock(&fsdb->fsdb_mutex);
if (canceled_label != NULL) {
OBD_ALLOC_PTR(mti);
/* write pool def to all MDT logs */
for (i = 0; i < INDEX_MAP_SIZE * 8; i++) {
- if (cfs_test_bit(i, fsdb->fsdb_mdt_index_map)) {
+ if (test_bit(i, fsdb->fsdb_mdt_index_map)) {
rc = name_create_mdt_and_lov(&logname, &lovname,
fsdb, i);
if (rc) {
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
GOTO(out_mti, rc);
}
if (canceled_label != NULL) {
name_destroy(&logname);
name_destroy(&lovname);
if (rc) {
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
GOTO(out_mti, rc);
}
}
rc = name_create(&logname, fsname, "-client");
if (rc) {
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
GOTO(out_mti, rc);
}
if (canceled_label != NULL) {
rc = mgs_modify(env, mgs, fsdb, mti, logname,
fsdb->fsdb_clilov, canceled_label, CM_SKIP);
if (rc < 0) {
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
name_destroy(&logname);
GOTO(out_mti, rc);
}
rc = mgs_write_log_pool(env, mgs, logname, fsdb, fsdb->fsdb_clilov,
cmd, fsname, poolname, ostname, label);
- cfs_mutex_unlock(&fsdb->fsdb_mutex);
+ mutex_unlock(&fsdb->fsdb_mutex);
name_destroy(&logname);
/* request for update */
mgs_revoke_lock(mgs, fsdb, CONFIG_T_CONFIG);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff