inode->i_generation, inode);
mdc_pack_fid(&mdc_fid, inode->i_ino, inode->i_generation, S_IFDIR);
-
+ mdc_fid.mds = ll_i2info(inode)->lli_mds;
offset = page->index << PAGE_SHIFT;
- rc = mdc_readpage(ll_i2sbi(inode)->ll_mdc_exp, &mdc_fid,
+ rc = md_readpage(ll_i2sbi(inode)->ll_mdc_exp, &mdc_fid,
offset, page, &request);
if (!rc) {
body = lustre_msg_buf(request->rq_repmsg, 0, sizeof (*body));
- LASSERT (body != NULL); /* checked by mdc_readpage() */
- LASSERT_REPSWABBED (request, 0); /* swabbed by mdc_readpage() */
+ LASSERT (body != NULL); /* checked by md_readpage() */
+ LASSERT_REPSWABBED (request, 0);/*swabbed by md_readpage()*/
- inode->i_size = body->size;
+#warning "FIXME ASAP!"
+ //inode->i_size = body->size;
SetPageUptodate(page);
}
ptlrpc_req_finished(request);
}
struct address_space_operations ll_dir_aops = {
- .readpage = ll_dir_readpage,
+ readpage: ll_dir_readpage,
};
/*
ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_UPDATE } };
int rc;
+ obddev = md_get_real_obd(ll_i2sbi(dir)->ll_mdc_exp, NULL, 0);
rc = ldlm_lock_match(obddev->obd_namespace, LDLM_FL_BLOCK_GRANTED,
&res_id, LDLM_IBITS, &policy, LCK_PR, &lockh);
if (!rc) {
ll_prepare_mdc_op_data(&data, dir, NULL, NULL, 0, 0);
- rc = mdc_enqueue(ll_i2sbi(dir)->ll_mdc_exp, LDLM_IBITS, &it,
+ rc = md_enqueue(ll_i2sbi(dir)->ll_mdc_exp, LDLM_IBITS, &it,
LCK_PR, &data, &lockh, NULL, 0,
ldlm_completion_ast, ll_mdc_blocking_ast, dir);
n, npages, inode->i_size);
page = ll_get_dir_page(inode, n);
- /* size might have been updated by mdc_readpage */
+ /* size might have been updated by md_readpage */
npages = dir_pages(inode);
if (IS_ERR(page)) {
RETURN(rc);
}
+static int ll_mkdir_stripe(struct inode *inode, unsigned long arg)
+{
+ char *name;
+ struct ll_user_mkdir_stripe lums;
+ struct ptlrpc_request *request = NULL;
+ struct ll_sb_info *sbi = ll_i2sbi(inode);
+ struct mdc_op_data op_data;
+ u16 nstripes;
+ mode_t mode;
+ int err = 0;
+ ENTRY;
+
+ if (copy_from_user(&lums, (void *)arg, sizeof(lums)))
+ RETURN(-EFAULT);
+
+ if (lums.lums_namelen <= 0)
+ RETURN(-EINVAL);
+ OBD_ALLOC(name, lums.lums_namelen);
+ if (!name)
+ RETURN(-ENOMEM);
+
+ if (copy_from_user(name, lums.lums_name, lums.lums_namelen))
+ GOTO(out, err=-EFAULT);
+
+ CDEBUG(D_VFSTRACE, "ioctl Op:name=%s,dir=%lu/%u(%p)\n",
+ name, inode->i_ino, inode->i_generation, inode);
+ nstripes = lums.lums_nstripes;
+
+ mode = lums.lums_mode;
+ mode = (mode & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
+ ll_prepare_mdc_op_data(&op_data, inode, NULL, name,lums.lums_namelen,0);
+ err = md_create(sbi->ll_mdc_exp, &op_data, &nstripes, sizeof(nstripes),
+ mode, current->fsuid, current->fsgid, 0, &request);
+ ptlrpc_req_finished(request);
+
+out:
+ OBD_FREE(name, lums.lums_namelen);
+ RETURN(err);
+}
+
static int ll_dir_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
switch(cmd) {
case EXT3_IOC_GETFLAGS:
case EXT3_IOC_SETFLAGS:
- RETURN(ll_iocontrol(inode, file, cmd, arg));
+ RETURN( ll_iocontrol(inode, file, cmd, arg) );
case IOC_MDC_LOOKUP: {
struct ptlrpc_request *request = NULL;
struct ll_fid fid;
valid = OBD_MD_FLID;
ll_inode2fid(&fid, inode);
- rc = mdc_getattr_name(sbi->ll_mdc_exp, &fid,
- filename, namelen, valid, 0, &request);
+ rc = md_getattr_name(sbi->ll_mdc_exp, &fid,
+ filename, namelen, valid,
+ 0, &request);
if (rc < 0) {
- CDEBUG(D_INFO, "mdc_getattr_name: %d\n", rc);
+ CDEBUG(D_INFO, "md_getattr_name: %d\n", rc);
GOTO(out, rc);
}
obd_ioctl_freedata(buf, len);
return rc;
}
- case LL_IOC_LOV_SETSTRIPE: {
- struct ptlrpc_request *request = NULL;
- struct mdc_op_data op_data;
- struct iattr attr = { 0 };
- struct lov_user_md lum, *lump = (struct lov_user_md *)arg;
- int rc = 0;
-
- ll_prepare_mdc_op_data(&op_data, inode, NULL, NULL, 0, 0);
-
- LASSERT(sizeof(lum) == sizeof(*lump));
- LASSERT(sizeof(lum.lmm_objects[0]) ==
- sizeof(lump->lmm_objects[0]));
- rc = copy_from_user(&lum, lump, sizeof(lum));
- if (rc)
- return(-EFAULT);
-
- if (lum.lmm_magic != LOV_USER_MAGIC)
- RETURN(-EINVAL);
-
- rc = mdc_setattr(sbi->ll_mdc_exp, &op_data,
- &attr, &lum, sizeof(lum), NULL, 0, &request);
- if (rc) {
- ptlrpc_req_finished(request);
- if (rc != -EPERM && rc != -EACCES)
- CERROR("mdc_setattr fails: rc = %d\n", rc);
- return rc;
- }
- ptlrpc_req_finished(request);
-
- return rc;
- }
- case LL_IOC_LOV_GETSTRIPE: {
- struct ptlrpc_request *request = NULL;
- struct lov_user_md *lump = (struct lov_user_md *)arg;
- struct lov_mds_md *lmm;
- struct ll_fid fid;
- struct mds_body *body;
- unsigned long valid = 0;
- int rc, lmmsize;
-
- valid |= OBD_MD_FLDIREA;
-
- ll_inode2fid(&fid, inode);
- rc = mdc_getattr(sbi->ll_mdc_exp, &fid, valid,
- obd_size_diskmd(sbi->ll_osc_exp, NULL),
- &request);
- if (rc < 0) {
- CDEBUG(D_INFO, "mdc_getattr failed: rc = %d\n", rc);
- RETURN(rc);
- }
-
- body = lustre_msg_buf(request->rq_repmsg, 0, sizeof(*body));
- LASSERT(body != NULL); /* checked by mdc_getattr_name */
- LASSERT_REPSWABBED(request, 0);/* swabbed by mdc_getattr_name */
-
- lmmsize = body->eadatasize;
- if (lmmsize == 0)
- GOTO(out_get, rc = -ENODATA);
-
- lmm = lustre_msg_buf(request->rq_repmsg, 1, lmmsize);
- LASSERT(lmm != NULL);
- LASSERT_REPSWABBED(request, 1);
- rc = copy_to_user(lump, lmm, lmmsize);
- if (rc)
- GOTO(out_get, rc = -EFAULT);
-
- EXIT;
- out_get:
- ptlrpc_req_finished(request);
- RETURN(rc);
- }
+ case LL_IOC_MDC_MKDIRSTRIPE:
+ RETURN(ll_mkdir_stripe(inode, arg));
+ case LL_IOC_LOV_SETSTRIPE:
+ case LL_IOC_LOV_GETSTRIPE:
+ RETURN(-ENOTTY);
case IOC_MDC_GETSTRIPE: {
struct ptlrpc_request *request = NULL;
struct ll_fid fid;
RETURN(PTR_ERR(filename));
ll_inode2fid(&fid, inode);
- rc = mdc_getattr_name(sbi->ll_mdc_exp, &fid, filename,
- strlen(filename)+1, OBD_MD_FLEASIZE,
- obd_size_diskmd(sbi->ll_osc_exp, NULL),
- &request);
+ rc = md_getattr_name(sbi->ll_mdc_exp, &fid, filename,
+ strlen(filename)+1, OBD_MD_FLEASIZE,
+ obd_size_diskmd(sbi->ll_osc_exp, NULL),
+ &request);
if (rc < 0) {
- CDEBUG(D_INFO, "mdc_getattr_name failed on %s: rc %d\n",
+ CDEBUG(D_INFO,
+ "md_getattr_name failed on %s: rc %d\n",
filename, rc);
GOTO(out_name, rc);
}
body = lustre_msg_buf(request->rq_repmsg, 0, sizeof (*body));
- LASSERT(body != NULL); /* checked by mdc_getattr_name */
+ LASSERT(body != NULL); /* checked by md_getattr_name */
LASSERT_REPSWABBED(request, 0);/* swabbed by mdc_getattr_name */
lmmsize = body->eadatasize;
int rc, len=0;
struct client_obd *cli;
struct obd_device *obd;
-
+
rc = obd_ioctl_getdata(&buf, &len, (void *)arg);
if (rc)
RETURN(rc);
data = (void *)buf;
obd = class_name2obd(data->ioc_inlbuf1);
-
+
if (!obd )
GOTO(out_ping, rc = -ENODEV);
-
+
if (!obd->obd_attached) {
CERROR("Device %d not attached\n", obd->obd_minor);
GOTO(out_ping, rc = -ENODEV);
rc = ptlrpc_queue_wait(req);
- ptlrpc_req_finished(req);
+ ptlrpc_req_finished(req);
out_ping:
obd_ioctl_freedata(buf, len);
return rc;
int rc, len = 0;
char *bufs[2], *str;
int lens[2], size;
-
+
rc = obd_ioctl_getdata(&buf, &len, (void *)arg);
if (rc)
RETURN(rc);
obd_ioctl_freedata(buf, len);
RETURN(-EINVAL);
}
-
+
lens[0] = data->ioc_inllen1;
bufs[0] = data->ioc_inlbuf1;
if (data->ioc_inllen2) {
bufs[1] = NULL;
}
size = data->ioc_plen1;
- req = ptlrpc_prep_req(sbi2mdc(sbi)->cl_import, LLOG_CATINFO,
+ req = ptlrpc_prep_req(sbi2mdc(sbi)->cl_import, LLOG_CATINFO,
2, lens, bufs);
if (!req)
GOTO(out_catinfo, rc = -ENOMEM);
req->rq_replen = lustre_msg_size(1, &size);
-
+
rc = ptlrpc_queue_wait(req);
str = lustre_msg_string(req->rq_repmsg, 0, data->ioc_plen1);
if (!rc)
- rc = copy_to_user(data->ioc_pbuf1, str,
+ rc = copy_to_user(data->ioc_pbuf1, str,
data->ioc_plen1);
ptlrpc_req_finished(req);
out_catinfo:
obd_ioctl_freedata(buf, len);
RETURN(rc);
- }
+ }
default:
return obd_iocontrol(cmd, sbi->ll_osc_exp,0,NULL,(void *)arg);
}
}
struct file_operations ll_dir_operations = {
- .open = ll_dir_open,
- .release = ll_dir_release,
- .read = generic_read_dir,
- .readdir = ll_readdir,
- .ioctl = ll_dir_ioctl
+ open: ll_dir_open,
+ release: ll_dir_release,
+ read: generic_read_dir,
+ readdir: ll_readdir,
+ ioctl: ll_dir_ioctl
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff