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-2515 quota: handle OBD_QC_CALLBACK for interoperability
[fs/lustre-release.git]
/
lustre
/
ofd
/
ofd_fs.c
diff --git
a/lustre/ofd/ofd_fs.c
b/lustre/ofd/ofd_fs.c
index
ee01de2
..
ea2fd06
100644
(file)
--- a/
lustre/ofd/ofd_fs.c
+++ b/
lustre/ofd/ofd_fs.c
@@
-72,9
+72,9
@@
int ofd_precreate_batch(struct ofd_device *ofd, int batch)
{
int count;
-
cfs_
spin_lock(&ofd->ofd_objid_lock);
+ spin_lock(&ofd->ofd_objid_lock);
count = min(ofd->ofd_precreate_batch, batch);
-
cfs_
spin_unlock(&ofd->ofd_objid_lock);
+ spin_unlock(&ofd->ofd_objid_lock);
return count;
}
@@
-85,9
+85,9
@@
obd_id ofd_last_id(struct ofd_device *ofd, obd_seq group)
LASSERT(group <= ofd->ofd_max_group);
-
cfs_
spin_lock(&ofd->ofd_objid_lock);
+ spin_lock(&ofd->ofd_objid_lock);
id = ofd->ofd_last_objids[group];
-
cfs_
spin_unlock(&ofd->ofd_objid_lock);
+ spin_unlock(&ofd->ofd_objid_lock);
return id;
}
@@
-95,10
+95,10
@@
obd_id ofd_last_id(struct ofd_device *ofd, obd_seq group)
void ofd_last_id_set(struct ofd_device *ofd, obd_id id, obd_seq group)
{
LASSERT(group <= ofd->ofd_max_group);
-
cfs_
spin_lock(&ofd->ofd_objid_lock);
+ spin_lock(&ofd->ofd_objid_lock);
if (ofd->ofd_last_objids[group] < id)
ofd->ofd_last_objids[group] = id;
-
cfs_
spin_unlock(&ofd->ofd_objid_lock);
+ spin_unlock(&ofd->ofd_objid_lock);
}
int ofd_last_id_write(const struct lu_env *env, struct ofd_device *ofd,
@@
-179,7
+179,7
@@
int ofd_group_load(const struct lu_env *env, struct ofd_device *ofd, int group)
RETURN(PTR_ERR(dob));
ofd->ofd_lastid_obj[group] = dob;
-
cfs_
mutex_init(&ofd->ofd_create_locks[group]);
+ mutex_init(&ofd->ofd_create_locks[group]);
rc = dt_attr_get(env, dob, &info->fti_attr, BYPASS_CAPA);
if (rc)
@@
-225,14
+225,13
@@
int ofd_groups_init(const struct lu_env *env, struct ofd_device *ofd)
ENTRY;
-
cfs_
spin_lock_init(&ofd->ofd_objid_lock);
+ spin_lock_init(&ofd->ofd_objid_lock);
rc = dt_attr_get(env, ofd->ofd_last_group_file,
&info->fti_attr, BYPASS_CAPA);
if (rc)
GOTO(cleanup, rc);
- ofd->ofd_precreate_batch = OFD_PRECREATE_BATCH_DEFAULT;
groups_size = (unsigned long)info->fti_attr.la_size;
if (groups_size == sizeof(last_group)) {
@@
-267,7
+266,7
@@
int ofd_groups_init(const struct lu_env *env, struct ofd_device *ofd)
}
}
- C
WARN(
"%s: %u groups initialized\n",
+ C
DEBUG(D_OTHER,
"%s: %u groups initialized\n",
ofd_obd(ofd)->obd_name, ofd->ofd_max_group + 1);
cleanup:
RETURN(rc);
@@
-299,7
+298,7
@@
int ofd_clients_data_init(const struct lu_env *env, struct ofd_device *ofd,
* fsfilt_read_record(), in case sizeof(*lcd)
* isn't the same as fsd->lsd_client_size. */
off = lsd->lsd_client_start + cl_idx * lsd->lsd_client_size;
- rc =
lu
t_client_data_read(env, &ofd->ofd_lut, lcd, &off, cl_idx);
+ rc =
tg
t_client_data_read(env, &ofd->ofd_lut, lcd, &off, cl_idx);
if (rc) {
CERROR("error reading FILT %s idx %d off %llu: rc %d\n",
LAST_RCVD, cl_idx, off, rc);
@@
-336,14
+335,14
@@
int ofd_clients_data_init(const struct lu_env *env, struct ofd_device *ofd,
fed = &exp->exp_filter_data;
*fed->fed_ted.ted_lcd = *lcd;
- rc =
lu
t_client_add(env, exp, cl_idx);
+ rc =
tg
t_client_add(env, exp, cl_idx);
LASSERTF(rc == 0, "rc = %d\n", rc); /* can't fail existing */
/* VBR: set export last committed version */
exp->exp_last_committed = last_rcvd;
-
cfs_
spin_lock(&exp->exp_lock);
+ spin_lock(&exp->exp_lock);
exp->exp_connecting = 0;
exp->exp_in_recovery = 0;
-
cfs_
spin_unlock(&exp->exp_lock);
+ spin_unlock(&exp->exp_lock);
obd->obd_max_recoverable_clients++;
class_export_put(exp);
@@
-351,10
+350,10
@@
int ofd_clients_data_init(const struct lu_env *env, struct ofd_device *ofd,
CDEBUG(D_OTHER, "client at idx %d has last_rcvd = "LPU64"\n",
cl_idx, last_rcvd);
-
cfs_
spin_lock(&ofd->ofd_lut.lut_translock);
+ spin_lock(&ofd->ofd_lut.lut_translock);
if (last_rcvd > lsd->lsd_last_transno)
lsd->lsd_last_transno = last_rcvd;
-
cfs_
spin_unlock(&ofd->ofd_lut.lut_translock);
+ spin_unlock(&ofd->ofd_lut.lut_translock);
}
err_out:
@@
-394,7
+393,7
@@
int ofd_server_data_init(const struct lu_env *env, struct ofd_device *ofd)
lsd->lsd_subdir_count = FILTER_SUBDIR_COUNT;
lsd->lsd_feature_incompat = OBD_INCOMPAT_OST;
} else {
- rc =
lu
t_server_data_read(env, &ofd->ofd_lut);
+ rc =
tg
t_server_data_read(env, &ofd->ofd_lut);
if (rc) {
CDEBUG(D_INODE,"OBD ofd: error reading %s: rc %d\n",
LAST_RCVD, rc);
@@
-451,13
+450,13
@@
int ofd_server_data_init(const struct lu_env *env, struct ofd_device *ofd)
rc = ofd_clients_data_init(env, ofd, last_rcvd_size);
-
cfs_
spin_lock(&ofd->ofd_lut.lut_translock);
+ spin_lock(&ofd->ofd_lut.lut_translock);
obd->obd_last_committed = lsd->lsd_last_transno;
ofd->ofd_lut.lut_last_transno = lsd->lsd_last_transno;
-
cfs_
spin_unlock(&ofd->ofd_lut.lut_translock);
+ spin_unlock(&ofd->ofd_lut.lut_translock);
/* save it, so mount count and last_transno is current */
- rc =
lu
t_server_data_update(env, &ofd->ofd_lut, 0);
+ rc =
tg
t_server_data_update(env, &ofd->ofd_lut, 0);
if (rc)
GOTO(err_fsd, rc);