mirror of https://gitee.com/openkylin/linux.git
exofs: Rename struct ore_components comps => oc
ore_components already has a comps member so this leads to things like comps->comps which is annoying. the name oc was already used in new code. So rename all old usage of ore_components comps => ore_components oc. Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
This commit is contained in:
parent
de74b05ace
commit
5bf696dad4
|
@ -71,7 +71,7 @@ struct exofs_sb_info {
|
||||||
*/
|
*/
|
||||||
struct ore_layout layout; /* Default files layout */
|
struct ore_layout layout; /* Default files layout */
|
||||||
struct ore_comp one_comp; /* id & cred of partition id=0*/
|
struct ore_comp one_comp; /* id & cred of partition id=0*/
|
||||||
struct ore_components comps; /* comps for the partition */
|
struct ore_components oc; /* comps for the partition */
|
||||||
struct osd_dev *_min_one_dev[1]; /* Place holder for one dev */
|
struct osd_dev *_min_one_dev[1]; /* Place holder for one dev */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ struct exofs_i_info {
|
||||||
uint32_t i_dir_start_lookup; /* which page to start lookup */
|
uint32_t i_dir_start_lookup; /* which page to start lookup */
|
||||||
uint64_t i_commit_size; /* the object's written length */
|
uint64_t i_commit_size; /* the object's written length */
|
||||||
struct ore_comp one_comp; /* same component for all devices */
|
struct ore_comp one_comp; /* same component for all devices */
|
||||||
struct ore_components comps; /* inode view of the device table */
|
struct ore_components oc; /* inode view of the device table */
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline osd_id exofs_oi_objno(struct exofs_i_info *oi)
|
static inline osd_id exofs_oi_objno(struct exofs_i_info *oi)
|
||||||
|
@ -207,7 +207,7 @@ extern const struct inode_operations exofs_fast_symlink_inode_operations;
|
||||||
* bigger and that the device table repeats twice.
|
* bigger and that the device table repeats twice.
|
||||||
* See: exofs_read_lookup_dev_table()
|
* See: exofs_read_lookup_dev_table()
|
||||||
*/
|
*/
|
||||||
static inline void exofs_init_comps(struct ore_components *comps,
|
static inline void exofs_init_comps(struct ore_components *oc,
|
||||||
struct ore_comp *one_comp,
|
struct ore_comp *one_comp,
|
||||||
struct exofs_sb_info *sbi, osd_id oid)
|
struct exofs_sb_info *sbi, osd_id oid)
|
||||||
{
|
{
|
||||||
|
@ -217,13 +217,13 @@ static inline void exofs_init_comps(struct ore_components *comps,
|
||||||
one_comp->obj.id = oid;
|
one_comp->obj.id = oid;
|
||||||
exofs_make_credential(one_comp->cred, &one_comp->obj);
|
exofs_make_credential(one_comp->cred, &one_comp->obj);
|
||||||
|
|
||||||
comps->numdevs = sbi->comps.numdevs;
|
oc->numdevs = sbi->oc.numdevs;
|
||||||
comps->single_comp = EC_SINGLE_COMP;
|
oc->single_comp = EC_SINGLE_COMP;
|
||||||
comps->comps = one_comp;
|
oc->comps = one_comp;
|
||||||
|
|
||||||
/* Round robin device view of the table */
|
/* Round robin device view of the table */
|
||||||
first_dev = (dev_mod * sbi->layout.mirrors_p1) % sbi->comps.numdevs;
|
first_dev = (dev_mod * sbi->layout.mirrors_p1) % sbi->oc.numdevs;
|
||||||
comps->ods = sbi->comps.ods + first_dev;
|
oc->ods = sbi->oc.ods + first_dev;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -270,7 +270,7 @@ static int read_exec(struct page_collect *pcol)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!pcol->ios) {
|
if (!pcol->ios) {
|
||||||
int ret = ore_get_rw_state(&pcol->sbi->layout, &oi->comps, true,
|
int ret = ore_get_rw_state(&pcol->sbi->layout, &oi->oc, true,
|
||||||
pcol->pg_first << PAGE_CACHE_SHIFT,
|
pcol->pg_first << PAGE_CACHE_SHIFT,
|
||||||
pcol->length, &pcol->ios);
|
pcol->length, &pcol->ios);
|
||||||
|
|
||||||
|
@ -516,7 +516,7 @@ static int write_exec(struct page_collect *pcol)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
BUG_ON(pcol->ios);
|
BUG_ON(pcol->ios);
|
||||||
ret = ore_get_rw_state(&pcol->sbi->layout, &oi->comps, false,
|
ret = ore_get_rw_state(&pcol->sbi->layout, &oi->oc, false,
|
||||||
pcol->pg_first << PAGE_CACHE_SHIFT,
|
pcol->pg_first << PAGE_CACHE_SHIFT,
|
||||||
pcol->length, &pcol->ios);
|
pcol->length, &pcol->ios);
|
||||||
|
|
||||||
|
@ -860,7 +860,7 @@ static int _do_truncate(struct inode *inode, loff_t newsize)
|
||||||
|
|
||||||
inode->i_mtime = inode->i_ctime = CURRENT_TIME;
|
inode->i_mtime = inode->i_ctime = CURRENT_TIME;
|
||||||
|
|
||||||
ret = ore_truncate(&sbi->layout, &oi->comps, (u64)newsize);
|
ret = ore_truncate(&sbi->layout, &oi->oc, (u64)newsize);
|
||||||
if (likely(!ret))
|
if (likely(!ret))
|
||||||
truncate_setsize(inode, newsize);
|
truncate_setsize(inode, newsize);
|
||||||
|
|
||||||
|
@ -927,14 +927,14 @@ static int exofs_get_inode(struct super_block *sb, struct exofs_i_info *oi,
|
||||||
struct exofs_on_disk_inode_layout *layout;
|
struct exofs_on_disk_inode_layout *layout;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = ore_get_io_state(&sbi->layout, &oi->comps, &ios);
|
ret = ore_get_io_state(&sbi->layout, &oi->oc, &ios);
|
||||||
if (unlikely(ret)) {
|
if (unlikely(ret)) {
|
||||||
EXOFS_ERR("%s: ore_get_io_state failed.\n", __func__);
|
EXOFS_ERR("%s: ore_get_io_state failed.\n", __func__);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
attrs[1].len = exofs_on_disk_inode_layout_size(sbi->comps.numdevs);
|
attrs[1].len = exofs_on_disk_inode_layout_size(sbi->oc.numdevs);
|
||||||
attrs[2].len = exofs_on_disk_inode_layout_size(sbi->comps.numdevs);
|
attrs[2].len = exofs_on_disk_inode_layout_size(sbi->oc.numdevs);
|
||||||
|
|
||||||
ios->in_attr = attrs;
|
ios->in_attr = attrs;
|
||||||
ios->in_attr_len = ARRAY_SIZE(attrs);
|
ios->in_attr_len = ARRAY_SIZE(attrs);
|
||||||
|
@ -1018,7 +1018,7 @@ struct inode *exofs_iget(struct super_block *sb, unsigned long ino)
|
||||||
return inode;
|
return inode;
|
||||||
oi = exofs_i(inode);
|
oi = exofs_i(inode);
|
||||||
__oi_init(oi);
|
__oi_init(oi);
|
||||||
exofs_init_comps(&oi->comps, &oi->one_comp, sb->s_fs_info,
|
exofs_init_comps(&oi->oc, &oi->one_comp, sb->s_fs_info,
|
||||||
exofs_oi_objno(oi));
|
exofs_oi_objno(oi));
|
||||||
|
|
||||||
/* read the inode from the osd */
|
/* read the inode from the osd */
|
||||||
|
@ -1172,13 +1172,13 @@ struct inode *exofs_new_inode(struct inode *dir, int mode)
|
||||||
spin_unlock(&sbi->s_next_gen_lock);
|
spin_unlock(&sbi->s_next_gen_lock);
|
||||||
insert_inode_hash(inode);
|
insert_inode_hash(inode);
|
||||||
|
|
||||||
exofs_init_comps(&oi->comps, &oi->one_comp, sb->s_fs_info,
|
exofs_init_comps(&oi->oc, &oi->one_comp, sb->s_fs_info,
|
||||||
exofs_oi_objno(oi));
|
exofs_oi_objno(oi));
|
||||||
exofs_sbi_write_stats(sbi); /* Make sure new sbi->s_nextid is on disk */
|
exofs_sbi_write_stats(sbi); /* Make sure new sbi->s_nextid is on disk */
|
||||||
|
|
||||||
mark_inode_dirty(inode);
|
mark_inode_dirty(inode);
|
||||||
|
|
||||||
ret = ore_get_io_state(&sbi->layout, &oi->comps, &ios);
|
ret = ore_get_io_state(&sbi->layout, &oi->oc, &ios);
|
||||||
if (unlikely(ret)) {
|
if (unlikely(ret)) {
|
||||||
EXOFS_ERR("exofs_new_inode: ore_get_io_state failed\n");
|
EXOFS_ERR("exofs_new_inode: ore_get_io_state failed\n");
|
||||||
return ERR_PTR(ret);
|
return ERR_PTR(ret);
|
||||||
|
@ -1267,7 +1267,7 @@ static int exofs_update_inode(struct inode *inode, int do_sync)
|
||||||
} else
|
} else
|
||||||
memcpy(fcb->i_data, oi->i_data, sizeof(fcb->i_data));
|
memcpy(fcb->i_data, oi->i_data, sizeof(fcb->i_data));
|
||||||
|
|
||||||
ret = ore_get_io_state(&sbi->layout, &oi->comps, &ios);
|
ret = ore_get_io_state(&sbi->layout, &oi->oc, &ios);
|
||||||
if (unlikely(ret)) {
|
if (unlikely(ret)) {
|
||||||
EXOFS_ERR("%s: ore_get_io_state failed.\n", __func__);
|
EXOFS_ERR("%s: ore_get_io_state failed.\n", __func__);
|
||||||
goto free_args;
|
goto free_args;
|
||||||
|
@ -1350,7 +1350,7 @@ void exofs_evict_inode(struct inode *inode)
|
||||||
/* ignore the error, attempt a remove anyway */
|
/* ignore the error, attempt a remove anyway */
|
||||||
|
|
||||||
/* Now Remove the OSD objects */
|
/* Now Remove the OSD objects */
|
||||||
ret = ore_get_io_state(&sbi->layout, &oi->comps, &ios);
|
ret = ore_get_io_state(&sbi->layout, &oi->oc, &ios);
|
||||||
if (unlikely(ret)) {
|
if (unlikely(ret)) {
|
||||||
EXOFS_ERR("%s: ore_get_io_state failed\n", __func__);
|
EXOFS_ERR("%s: ore_get_io_state failed\n", __func__);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -49,20 +49,20 @@ MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
static u8 *_ios_cred(struct ore_io_state *ios, unsigned index)
|
static u8 *_ios_cred(struct ore_io_state *ios, unsigned index)
|
||||||
{
|
{
|
||||||
return ios->comps->comps[index & ios->comps->single_comp].cred;
|
return ios->oc->comps[index & ios->oc->single_comp].cred;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct osd_obj_id *_ios_obj(struct ore_io_state *ios, unsigned index)
|
static struct osd_obj_id *_ios_obj(struct ore_io_state *ios, unsigned index)
|
||||||
{
|
{
|
||||||
return &ios->comps->comps[index & ios->comps->single_comp].obj;
|
return &ios->oc->comps[index & ios->oc->single_comp].obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct osd_dev *_ios_od(struct ore_io_state *ios, unsigned index)
|
static struct osd_dev *_ios_od(struct ore_io_state *ios, unsigned index)
|
||||||
{
|
{
|
||||||
return ios->comps->ods[index];
|
return ios->oc->ods[index];
|
||||||
}
|
}
|
||||||
|
|
||||||
int ore_get_rw_state(struct ore_layout *layout, struct ore_components *comps,
|
int ore_get_rw_state(struct ore_layout *layout, struct ore_components *oc,
|
||||||
bool is_reading, u64 offset, u64 length,
|
bool is_reading, u64 offset, u64 length,
|
||||||
struct ore_io_state **pios)
|
struct ore_io_state **pios)
|
||||||
{
|
{
|
||||||
|
@ -71,16 +71,16 @@ int ore_get_rw_state(struct ore_layout *layout, struct ore_components *comps,
|
||||||
/*TODO: Maybe use kmem_cach per sbi of size
|
/*TODO: Maybe use kmem_cach per sbi of size
|
||||||
* exofs_io_state_size(layout->s_numdevs)
|
* exofs_io_state_size(layout->s_numdevs)
|
||||||
*/
|
*/
|
||||||
ios = kzalloc(ore_io_state_size(comps->numdevs), GFP_KERNEL);
|
ios = kzalloc(ore_io_state_size(oc->numdevs), GFP_KERNEL);
|
||||||
if (unlikely(!ios)) {
|
if (unlikely(!ios)) {
|
||||||
ORE_DBGMSG("Failed kzalloc bytes=%d\n",
|
ORE_DBGMSG("Failed kzalloc bytes=%d\n",
|
||||||
ore_io_state_size(comps->numdevs));
|
ore_io_state_size(oc->numdevs));
|
||||||
*pios = NULL;
|
*pios = NULL;
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
ios->layout = layout;
|
ios->layout = layout;
|
||||||
ios->comps = comps;
|
ios->oc = oc;
|
||||||
ios->offset = offset;
|
ios->offset = offset;
|
||||||
ios->length = length;
|
ios->length = length;
|
||||||
ios->reading = is_reading;
|
ios->reading = is_reading;
|
||||||
|
@ -90,10 +90,10 @@ int ore_get_rw_state(struct ore_layout *layout, struct ore_components *comps,
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(ore_get_rw_state);
|
EXPORT_SYMBOL(ore_get_rw_state);
|
||||||
|
|
||||||
int ore_get_io_state(struct ore_layout *layout, struct ore_components *comps,
|
int ore_get_io_state(struct ore_layout *layout, struct ore_components *oc,
|
||||||
struct ore_io_state **ios)
|
struct ore_io_state **ios)
|
||||||
{
|
{
|
||||||
return ore_get_rw_state(layout, comps, true, 0, 0, ios);
|
return ore_get_rw_state(layout, oc, true, 0, 0, ios);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(ore_get_io_state);
|
EXPORT_SYMBOL(ore_get_io_state);
|
||||||
|
|
||||||
|
@ -476,7 +476,7 @@ int ore_create(struct ore_io_state *ios)
|
||||||
{
|
{
|
||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
for (i = 0; i < ios->comps->numdevs; i++) {
|
for (i = 0; i < ios->oc->numdevs; i++) {
|
||||||
struct osd_request *or;
|
struct osd_request *or;
|
||||||
|
|
||||||
or = osd_start_request(_ios_od(ios, i), GFP_KERNEL);
|
or = osd_start_request(_ios_od(ios, i), GFP_KERNEL);
|
||||||
|
@ -501,7 +501,7 @@ int ore_remove(struct ore_io_state *ios)
|
||||||
{
|
{
|
||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
for (i = 0; i < ios->comps->numdevs; i++) {
|
for (i = 0; i < ios->oc->numdevs; i++) {
|
||||||
struct osd_request *or;
|
struct osd_request *or;
|
||||||
|
|
||||||
or = osd_start_request(_ios_od(ios, i), GFP_KERNEL);
|
or = osd_start_request(_ios_od(ios, i), GFP_KERNEL);
|
||||||
|
@ -768,7 +768,7 @@ static void _calc_trunk_info(struct ore_layout *layout, u64 file_offset,
|
||||||
ti->max_devs = layout->group_width * layout->group_count;
|
ti->max_devs = layout->group_width * layout->group_count;
|
||||||
}
|
}
|
||||||
|
|
||||||
int ore_truncate(struct ore_layout *layout, struct ore_components *comps,
|
int ore_truncate(struct ore_layout *layout, struct ore_components *oc,
|
||||||
u64 size)
|
u64 size)
|
||||||
{
|
{
|
||||||
struct ore_io_state *ios;
|
struct ore_io_state *ios;
|
||||||
|
@ -779,7 +779,7 @@ int ore_truncate(struct ore_layout *layout, struct ore_components *comps,
|
||||||
struct _trunc_info ti;
|
struct _trunc_info ti;
|
||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
ret = ore_get_io_state(layout, comps, &ios);
|
ret = ore_get_io_state(layout, oc, &ios);
|
||||||
if (unlikely(ret))
|
if (unlikely(ret))
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -792,7 +792,7 @@ int ore_truncate(struct ore_layout *layout, struct ore_components *comps,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
ios->numdevs = ios->comps->numdevs;
|
ios->numdevs = ios->oc->numdevs;
|
||||||
|
|
||||||
for (i = 0; i < ti.max_devs; ++i) {
|
for (i = 0; i < ti.max_devs; ++i) {
|
||||||
struct exofs_trunc_attr *size_attr = &size_attrs[i];
|
struct exofs_trunc_attr *size_attr = &size_attrs[i];
|
||||||
|
@ -815,7 +815,7 @@ int ore_truncate(struct ore_layout *layout, struct ore_components *comps,
|
||||||
size_attr->attr.val_ptr = &size_attr->newsize;
|
size_attr->attr.val_ptr = &size_attr->newsize;
|
||||||
|
|
||||||
ORE_DBGMSG("trunc(0x%llx) obj_offset=0x%llx dev=%d\n",
|
ORE_DBGMSG("trunc(0x%llx) obj_offset=0x%llx dev=%d\n",
|
||||||
_LLU(comps->comps->obj.id), _LLU(obj_size), i);
|
_LLU(oc->comps->obj.id), _LLU(obj_size), i);
|
||||||
ret = _truncate_mirrors(ios, i * ios->layout->mirrors_p1,
|
ret = _truncate_mirrors(ios, i * ios->layout->mirrors_p1,
|
||||||
&size_attr->attr);
|
&size_attr->attr);
|
||||||
if (unlikely(ret))
|
if (unlikely(ret))
|
||||||
|
|
|
@ -266,7 +266,7 @@ static int __sbi_read_stats(struct exofs_sb_info *sbi)
|
||||||
struct ore_io_state *ios;
|
struct ore_io_state *ios;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = ore_get_io_state(&sbi->layout, &sbi->comps, &ios);
|
ret = ore_get_io_state(&sbi->layout, &sbi->oc, &ios);
|
||||||
if (unlikely(ret)) {
|
if (unlikely(ret)) {
|
||||||
EXOFS_ERR("%s: ore_get_io_state failed.\n", __func__);
|
EXOFS_ERR("%s: ore_get_io_state failed.\n", __func__);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -321,7 +321,7 @@ int exofs_sbi_write_stats(struct exofs_sb_info *sbi)
|
||||||
struct ore_io_state *ios;
|
struct ore_io_state *ios;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = ore_get_io_state(&sbi->layout, &sbi->comps, &ios);
|
ret = ore_get_io_state(&sbi->layout, &sbi->oc, &ios);
|
||||||
if (unlikely(ret)) {
|
if (unlikely(ret)) {
|
||||||
EXOFS_ERR("%s: ore_get_io_state failed.\n", __func__);
|
EXOFS_ERR("%s: ore_get_io_state failed.\n", __func__);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -360,7 +360,7 @@ static int exofs_sync_fs(struct super_block *sb, int wait)
|
||||||
struct exofs_sb_info *sbi;
|
struct exofs_sb_info *sbi;
|
||||||
struct exofs_fscb *fscb;
|
struct exofs_fscb *fscb;
|
||||||
struct ore_comp one_comp;
|
struct ore_comp one_comp;
|
||||||
struct ore_components comps;
|
struct ore_components oc;
|
||||||
struct ore_io_state *ios;
|
struct ore_io_state *ios;
|
||||||
int ret = -ENOMEM;
|
int ret = -ENOMEM;
|
||||||
|
|
||||||
|
@ -378,9 +378,9 @@ static int exofs_sync_fs(struct super_block *sb, int wait)
|
||||||
* the writeable info is set in exofs_sbi_write_stats() above.
|
* the writeable info is set in exofs_sbi_write_stats() above.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
exofs_init_comps(&comps, &one_comp, sbi, EXOFS_SUPER_ID);
|
exofs_init_comps(&oc, &one_comp, sbi, EXOFS_SUPER_ID);
|
||||||
|
|
||||||
ret = ore_get_io_state(&sbi->layout, &comps, &ios);
|
ret = ore_get_io_state(&sbi->layout, &oc, &ios);
|
||||||
if (unlikely(ret))
|
if (unlikely(ret))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -431,17 +431,17 @@ static void _exofs_print_device(const char *msg, const char *dev_path,
|
||||||
|
|
||||||
static void exofs_free_sbi(struct exofs_sb_info *sbi)
|
static void exofs_free_sbi(struct exofs_sb_info *sbi)
|
||||||
{
|
{
|
||||||
while (sbi->comps.numdevs) {
|
while (sbi->oc.numdevs) {
|
||||||
int i = --sbi->comps.numdevs;
|
int i = --sbi->oc.numdevs;
|
||||||
struct osd_dev *od = sbi->comps.ods[i];
|
struct osd_dev *od = sbi->oc.ods[i];
|
||||||
|
|
||||||
if (od) {
|
if (od) {
|
||||||
sbi->comps.ods[i] = NULL;
|
sbi->oc.ods[i] = NULL;
|
||||||
osduld_put_device(od);
|
osduld_put_device(od);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (sbi->comps.ods != sbi->_min_one_dev)
|
if (sbi->oc.ods != sbi->_min_one_dev)
|
||||||
kfree(sbi->comps.ods);
|
kfree(sbi->oc.ods);
|
||||||
kfree(sbi);
|
kfree(sbi);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -468,7 +468,7 @@ static void exofs_put_super(struct super_block *sb)
|
||||||
msecs_to_jiffies(100));
|
msecs_to_jiffies(100));
|
||||||
}
|
}
|
||||||
|
|
||||||
_exofs_print_device("Unmounting", NULL, sbi->comps.ods[0],
|
_exofs_print_device("Unmounting", NULL, sbi->oc.ods[0],
|
||||||
sbi->one_comp.obj.partition);
|
sbi->one_comp.obj.partition);
|
||||||
|
|
||||||
bdi_destroy(&sbi->bdi);
|
bdi_destroy(&sbi->bdi);
|
||||||
|
@ -623,7 +623,7 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info *sbi,
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
sbi->comps.numdevs = 0;
|
sbi->oc.numdevs = 0;
|
||||||
|
|
||||||
comp.obj.partition = sbi->one_comp.obj.partition;
|
comp.obj.partition = sbi->one_comp.obj.partition;
|
||||||
comp.obj.id = EXOFS_DEVTABLE_ID;
|
comp.obj.id = EXOFS_DEVTABLE_ID;
|
||||||
|
@ -648,13 +648,13 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info *sbi,
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (likely(numdevs > 1)) {
|
if (likely(numdevs > 1)) {
|
||||||
unsigned size = numdevs * sizeof(sbi->comps.ods[0]);
|
unsigned size = numdevs * sizeof(sbi->oc.ods[0]);
|
||||||
|
|
||||||
/* Twice bigger table: See exofs_init_comps() and below
|
/* Twice bigger table: See exofs_init_comps() and below
|
||||||
* comment
|
* comment
|
||||||
*/
|
*/
|
||||||
sbi->comps.ods = kzalloc(size + size - 1, GFP_KERNEL);
|
sbi->oc.ods = kzalloc(size + size - 1, GFP_KERNEL);
|
||||||
if (unlikely(!sbi->comps.ods)) {
|
if (unlikely(!sbi->oc.ods)) {
|
||||||
EXOFS_ERR("ERROR: faild allocating Device array[%d]\n",
|
EXOFS_ERR("ERROR: faild allocating Device array[%d]\n",
|
||||||
numdevs);
|
numdevs);
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
|
@ -681,8 +681,8 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info *sbi,
|
||||||
* line. We always keep them in device-table order.
|
* line. We always keep them in device-table order.
|
||||||
*/
|
*/
|
||||||
if (fscb_od && osduld_device_same(fscb_od, &odi)) {
|
if (fscb_od && osduld_device_same(fscb_od, &odi)) {
|
||||||
sbi->comps.ods[i] = fscb_od;
|
sbi->oc.ods[i] = fscb_od;
|
||||||
++sbi->comps.numdevs;
|
++sbi->oc.numdevs;
|
||||||
fscb_od = NULL;
|
fscb_od = NULL;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -695,8 +695,8 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info *sbi,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
sbi->comps.ods[i] = od;
|
sbi->oc.ods[i] = od;
|
||||||
++sbi->comps.numdevs;
|
++sbi->oc.numdevs;
|
||||||
|
|
||||||
/* Read the fscb of the other devices to make sure the FS
|
/* Read the fscb of the other devices to make sure the FS
|
||||||
* partition is there.
|
* partition is there.
|
||||||
|
@ -719,7 +719,7 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info *sbi,
|
||||||
out:
|
out:
|
||||||
kfree(dt);
|
kfree(dt);
|
||||||
if (likely(!ret)) {
|
if (likely(!ret)) {
|
||||||
unsigned numdevs = sbi->comps.numdevs;
|
unsigned numdevs = sbi->oc.numdevs;
|
||||||
|
|
||||||
if (unlikely(fscb_od)) {
|
if (unlikely(fscb_od)) {
|
||||||
EXOFS_ERR("ERROR: Bad device-table container device not present\n");
|
EXOFS_ERR("ERROR: Bad device-table container device not present\n");
|
||||||
|
@ -732,7 +732,7 @@ static int exofs_read_lookup_dev_table(struct exofs_sb_info *sbi,
|
||||||
* starting at this device. See exofs_init_comps()
|
* starting at this device. See exofs_init_comps()
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < numdevs - 1; ++i)
|
for (i = 0; i < numdevs - 1; ++i)
|
||||||
sbi->comps.ods[i + numdevs] = sbi->comps.ods[i];
|
sbi->oc.ods[i + numdevs] = sbi->oc.ods[i];
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -783,10 +783,10 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
|
||||||
sbi->one_comp.obj.partition = opts->pid;
|
sbi->one_comp.obj.partition = opts->pid;
|
||||||
sbi->one_comp.obj.id = 0;
|
sbi->one_comp.obj.id = 0;
|
||||||
exofs_make_credential(sbi->one_comp.cred, &sbi->one_comp.obj);
|
exofs_make_credential(sbi->one_comp.cred, &sbi->one_comp.obj);
|
||||||
sbi->comps.numdevs = 1;
|
sbi->oc.numdevs = 1;
|
||||||
sbi->comps.single_comp = EC_SINGLE_COMP;
|
sbi->oc.single_comp = EC_SINGLE_COMP;
|
||||||
sbi->comps.comps = &sbi->one_comp;
|
sbi->oc.comps = &sbi->one_comp;
|
||||||
sbi->comps.ods = sbi->_min_one_dev;
|
sbi->oc.ods = sbi->_min_one_dev;
|
||||||
|
|
||||||
/* fill in some other data by hand */
|
/* fill in some other data by hand */
|
||||||
memset(sb->s_id, 0, sizeof(sb->s_id));
|
memset(sb->s_id, 0, sizeof(sb->s_id));
|
||||||
|
@ -835,7 +835,7 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
|
||||||
if (unlikely(ret))
|
if (unlikely(ret))
|
||||||
goto free_sbi;
|
goto free_sbi;
|
||||||
} else {
|
} else {
|
||||||
sbi->comps.ods[0] = od;
|
sbi->oc.ods[0] = od;
|
||||||
}
|
}
|
||||||
|
|
||||||
__sbi_read_stats(sbi);
|
__sbi_read_stats(sbi);
|
||||||
|
@ -875,7 +875,7 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
|
||||||
goto free_sbi;
|
goto free_sbi;
|
||||||
}
|
}
|
||||||
|
|
||||||
_exofs_print_device("Mounting", opts->dev_name, sbi->comps.ods[0],
|
_exofs_print_device("Mounting", opts->dev_name, sbi->oc.ods[0],
|
||||||
sbi->one_comp.obj.partition);
|
sbi->one_comp.obj.partition);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -924,7 +924,7 @@ static int exofs_statfs(struct dentry *dentry, struct kstatfs *buf)
|
||||||
uint64_t used = ULLONG_MAX;
|
uint64_t used = ULLONG_MAX;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = ore_get_io_state(&sbi->layout, &sbi->comps, &ios);
|
ret = ore_get_io_state(&sbi->layout, &sbi->oc, &ios);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
EXOFS_DBGMSG("ore_get_io_state failed.\n");
|
EXOFS_DBGMSG("ore_get_io_state failed.\n");
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -64,7 +64,7 @@ struct ore_io_state {
|
||||||
ore_io_done_fn done;
|
ore_io_done_fn done;
|
||||||
|
|
||||||
struct ore_layout *layout;
|
struct ore_layout *layout;
|
||||||
struct ore_components *comps;
|
struct ore_components *oc;
|
||||||
|
|
||||||
/* Global read/write IO*/
|
/* Global read/write IO*/
|
||||||
loff_t offset;
|
loff_t offset;
|
||||||
|
|
Loading…
Reference in New Issue