struct inode *inode;
int rc;
- dentry = osd_lookup_one_len_unlocked(name, osd_sb(osd)->s_root,
+ dentry = osd_lookup_one_len_unlocked(osd, name, osd_sb(osd)->s_root,
strlen(name));
if (IS_ERR(dentry))
return ERR_CAST(dentry);
if (rc)
return ERR_PTR(rc);
- dentry = osd_lookup_one_len_unlocked(name, osd_sb(osd)->s_root,
+ dentry = osd_lookup_one_len_unlocked(osd, name, osd_sb(osd)->s_root,
strlen(name));
if (IS_ERR(dentry))
return ERR_CAST(dentry);
RETURN(count);
}
-static int osd_remove_oi_one(struct dentry *parent, const char *name,
- int namelen)
+static int osd_remove_oi_one(struct osd_device *osd, struct dentry *parent,
+ const char *name, int namelen)
{
struct dentry *child;
int rc;
- child = osd_lookup_one_len_unlocked(name, parent, namelen);
+ child = osd_lookup_one_len_unlocked(osd, name, parent, namelen);
if (IS_ERR(child)) {
rc = PTR_ERR(child);
} else {
for (i = 0; i < OSD_OI_FID_NR_MAX; i++) {
namelen = snprintf(name, sizeof(name), "%s.%d",
OSD_OI_NAME_BASE, i);
- rc = osd_remove_oi_one(osd_sb(osd)->s_root, name, namelen);
+ rc = osd_remove_oi_one(osd, osd_sb(osd)->s_root, name, namelen);
if (rc != 0) {
CERROR("%s: fail to remove the stale OI file %s: "
"rc = %d\n", osd_dev2name(osd), name, rc);
}
namelen = snprintf(name, sizeof(name), "%s", OSD_OI_NAME_BASE);
- rc = osd_remove_oi_one(osd_sb(osd)->s_root, name, namelen);
+ rc = osd_remove_oi_one(osd, osd_sb(osd)->s_root, name, namelen);
if (rc != 0)
CERROR("%s: fail to remove the stale OI file %s: rc = %d\n",
osd_dev2name(osd), name, rc);
LASSERT(oi);
LASSERT(oi->oi_inode);
- ll_vfs_dq_init(oi->oi_inode);
+ dquot_initialize(oi->oi_inode);
bag = &oi->oi_dir.od_container;
ipd = osd_idx_ipd_get(oti->oti_env, bag);
LASSERT(oi);
LASSERT(oi->oi_inode);
- ll_vfs_dq_init(oi->oi_inode);
+ dquot_initialize(oi->oi_inode);
bag = &oi->oi_dir.od_container;
ipd = osd_idx_ipd_get(oti->oti_env, bag);