return (key0 << 1);
}
-static int ll_nfs_test_inode(struct inode *inode, void *opaque)
-{
- return lu_fid_eq(&ll_i2info(inode)->lli_fid,
- (struct lu_fid *)opaque);
-}
-
static struct inode *search_inode_for_lustre(struct super_block *sb,
- struct lu_fid *fid,
- int mode)
+ const struct lu_fid *fid)
{
struct ll_sb_info *sbi = ll_s2sbi(sb);
struct ptlrpc_request *req = NULL;
struct inode *inode = NULL;
- unsigned long valid = 0;
int eadatalen = 0;
- ino_t ino = ll_fid_build_ino(sbi, fid);
+ ino_t ino = cl_fid_build_ino(fid);
+ struct md_op_data *op_data;
int rc;
ENTRY;
CDEBUG(D_INFO, "searching inode for:(%lu,"DFID")\n", ino, PFID(fid));
- inode = ILOOKUP(sb, ino, ll_nfs_test_inode, fid);
- if (inode)
- RETURN(inode);
+ rc = ll_get_max_mdsize(sbi, &eadatalen);
+ if (rc)
+ RETURN(ERR_PTR(rc));
- if (S_ISREG(mode)) {
- rc = ll_get_max_mdsize(sbi, &eadatalen);
- if (rc)
- RETURN(ERR_PTR(rc));
- valid |= OBD_MD_FLEASIZE;
- }
+ /* Because inode is NULL, ll_prep_md_op_data can not
+ * be used here. So we allocate op_data ourselves */
+ OBD_ALLOC_PTR(op_data);
+ if (op_data == NULL)
+ return ERR_PTR(-ENOMEM);
+
+ op_data->op_fid1 = *fid;
+ op_data->op_mode = eadatalen;
+ op_data->op_valid = OBD_MD_FLEASIZE;
- rc = md_getattr(sbi->ll_md_exp, fid, NULL, valid, eadatalen, &req);
+ /* mds_fid2dentry ignores f_type */
+ rc = md_getattr(sbi->ll_md_exp, op_data, &req);
+ OBD_FREE_PTR(op_data);
if (rc) {
CERROR("can't get object attrs, fid "DFID", rc %d\n",
PFID(fid), rc);
RETURN(ERR_PTR(rc));
}
-
rc = ll_prep_inode(&inode, req, sb);
ptlrpc_req_finished(req);
if (rc)
}
static struct dentry *ll_iget_for_nfs(struct super_block *sb,
- struct lu_fid *fid,
- umode_t mode)
+ const struct lu_fid *fid)
{
struct inode *inode;
struct dentry *result;
if (!fid_is_sane(fid))
RETURN(ERR_PTR(-ESTALE));
- inode = search_inode_for_lustre(sb, fid, mode);
+ inode = search_inode_for_lustre(sb, fid);
if (IS_ERR(inode))
RETURN(ERR_PTR(PTR_ERR(inode)));
RETURN(ERR_PTR(-ESTALE));
}
- result = d_alloc_anon(inode);
+ result = d_obtain_alias(inode);
if (!result) {
iput(inode);
RETURN(ERR_PTR(-ENOMEM));
}
- ll_set_dd(result);
-
- lock_dentry(result);
- if (unlikely(result->d_op == &ll_init_d_ops)) {
- result->d_op = &ll_d_ops;
- unlock_dentry(result);
- smp_wmb();
- ll_d_wakeup(result);
- } else {
- result->d_op = &ll_d_ops;
- unlock_dentry(result);
- }
+ ll_dops_init(result, 1);
RETURN(result);
}
+#define LUSTRE_NFS_FID 0x97
+
+struct lustre_nfs_fid {
+ struct lu_fid lnf_child;
+ struct lu_fid lnf_parent;
+};
+
+/**
+ * \a connectable - is nfsd will connect himself or this should be done
+ * at lustre
+ *
+ * The return value is file handle type:
+ * 1 -- contains child file handle;
+ * 2 -- contains child file handle and parent file handle;
+ * 255 -- error.
+ */
+static int ll_encode_fh(struct dentry *de, __u32 *fh, int *plen,
+ int connectable)
+{
+ struct inode *inode = de->d_inode;
+ struct inode *parent = de->d_parent->d_inode;
+ struct lustre_nfs_fid *nfs_fid = (void *)fh;
+ ENTRY;
+
+ CDEBUG(D_INFO, "encoding for (%lu,"DFID") maxlen=%d minlen=%d\n",
+ inode->i_ino, PFID(ll_inode2fid(inode)), *plen,
+ (int)sizeof(struct lustre_nfs_fid));
+
+ if (*plen < sizeof(struct lustre_nfs_fid)/4)
+ RETURN(255);
+
+ nfs_fid->lnf_child = *ll_inode2fid(inode);
+ nfs_fid->lnf_parent = *ll_inode2fid(parent);
+ *plen = sizeof(struct lustre_nfs_fid)/4;
+
+ RETURN(LUSTRE_NFS_FID);
+}
+
+#ifdef HAVE_FH_TO_DENTRY
+static struct dentry *ll_fh_to_dentry(struct super_block *sb, struct fid *fid,
+ int fh_len, int fh_type)
+{
+ struct lustre_nfs_fid *nfs_fid = (struct lustre_nfs_fid *)fid;
+
+ if (fh_type != LUSTRE_NFS_FID)
+ RETURN(ERR_PTR(-EPROTO));
+
+ RETURN(ll_iget_for_nfs(sb, &nfs_fid->lnf_child));
+}
+
+static struct dentry *ll_fh_to_parent(struct super_block *sb, struct fid *fid,
+ int fh_len, int fh_type)
+{
+ struct lustre_nfs_fid *nfs_fid = (struct lustre_nfs_fid *)fid;
+
+ if (fh_type != LUSTRE_NFS_FID)
+ RETURN(ERR_PTR(-EPROTO));
+
+ RETURN(ll_iget_for_nfs(sb, &nfs_fid->lnf_parent));
+}
+
+#else
+
/*
* This length is counted as amount of __u32,
- * It is composed of a fid and a mode
+ * It is composed of a fid and a mode
*/
-#define ONE_FH_LEN (sizeof(struct lu_fid)/4 + 1)
-
static struct dentry *ll_decode_fh(struct super_block *sb, __u32 *fh, int fh_len,
int fh_type,
int (*acceptable)(void *, struct dentry *),
void *context)
{
- struct lu_fid *parent = NULL;
- struct lu_fid *child;
+ struct lustre_nfs_fid *nfs_fid = (void *)fh;
struct dentry *entry;
ENTRY;
- CDEBUG(D_INFO, "decoding for "DFID" fh_len=%d fh_type=%d\n",
- PFID((struct lu_fid*)fh), fh_len, fh_type);
+ CDEBUG(D_INFO, "decoding for "DFID" fh_len=%d fh_type=%x\n",
+ PFID(&nfs_fid->lnf_child), fh_len, fh_type);
- if (fh_type != 1 && fh_type != 2)
- RETURN(ERR_PTR(-ESTALE));
- if (fh_len < ONE_FH_LEN * fh_type)
- RETURN(ERR_PTR(-ESTALE));
+ if (fh_type != LUSTRE_NFS_FID)
+ RETURN(ERR_PTR(-EPROTO));
- child = (struct lu_fid*)fh;
- if (fh_type == 2)
- parent = (struct lu_fid*)(fh + ONE_FH_LEN);
-
- entry = sb->s_export_op->find_exported_dentry(sb, child, parent,
+ entry = sb->s_export_op->find_exported_dentry(sb, &nfs_fid->lnf_child,
+ &nfs_fid->lnf_parent,
acceptable, context);
RETURN(entry);
}
-/* The return value is file handle type:
- * 1 -- contains child file handle;
- * 2 -- contains child file handle and parent file handle;
- * 255 -- error.
- */
-static int ll_encode_fh(struct dentry *de, __u32 *fh, int *plen, int connectable)
-{
- struct inode *inode = de->d_inode;
- struct lu_fid *fid = ll_inode2fid(inode);
- ENTRY;
-
- CDEBUG(D_INFO, "encoding for (%lu,"DFID") maxlen=%d minlen=%d\n",
- inode->i_ino, PFID(fid), *plen, (int)ONE_FH_LEN);
-
- if (*plen < ONE_FH_LEN)
- RETURN(255);
-
- memcpy((char*)fh, fid, sizeof(*fid));
- *(fh + ONE_FH_LEN - 1) = (__u32)(S_IFMT & inode->i_mode);
-
- if (de->d_parent && *plen >= ONE_FH_LEN * 2) {
- struct inode *parent = de->d_parent->d_inode;
- fh += ONE_FH_LEN;
- memcpy((char*)fh, &ll_i2info(parent)->lli_fid, sizeof(*fid));
- *(fh + ONE_FH_LEN - 1) = (__u32)(S_IFMT & parent->i_mode);
- *plen = ONE_FH_LEN * 2;
- RETURN(2);
- } else {
- *plen = ONE_FH_LEN;
- RETURN(1);
- }
-}
-
static struct dentry *ll_get_dentry(struct super_block *sb, void *data)
{
- struct lu_fid *fid;
+ struct lustre_nfs_fid *fid = data;
struct dentry *entry;
- __u32 mode;
ENTRY;
- fid = (struct lu_fid *)data;
- mode = *((__u32*)data + ONE_FH_LEN - 1);
-
- entry = ll_iget_for_nfs(sb, fid, mode);
+ entry = ll_iget_for_nfs(sb, &fid->lnf_child);
RETURN(entry);
}
-
+#endif
static struct dentry *ll_get_parent(struct dentry *dchild)
{
struct ptlrpc_request *req = NULL;
struct dentry *result = NULL;
struct mdt_body *body;
static char dotdot[] = "..";
+ struct md_op_data *op_data;
int rc;
ENTRY;
-
+
LASSERT(dir && S_ISDIR(dir->i_mode));
-
+
sbi = ll_s2sbi(dir->i_sb);
-
- CDEBUG(D_INFO, "getting parent for (%lu,"DFID")\n",
+
+ CDEBUG(D_INFO, "getting parent for (%lu,"DFID")\n",
dir->i_ino, PFID(ll_inode2fid(dir)));
- rc = md_getattr_name(sbi->ll_md_exp, ll_inode2fid(dir), NULL,
- dotdot, strlen(dotdot) + 1, 0, 0,
- ll_i2suppgid(dir), &req);
+ op_data = ll_prep_md_op_data(NULL, dir, NULL, dotdot,
+ strlen(dotdot), 0,
+ LUSTRE_OPC_ANY, NULL);
+ if (op_data == NULL)
+ RETURN(ERR_PTR(-ENOMEM));
+
+ rc = md_getattr_name(sbi->ll_md_exp, op_data, &req);
+ ll_finish_md_op_data(op_data);
if (rc) {
CERROR("failure %d inode %lu get parent\n", rc, dir->i_ino);
RETURN(ERR_PTR(rc));
}
body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
LASSERT(body->valid & OBD_MD_FLID);
-
- CDEBUG(D_INFO, "parent for "DFID" is "DFID"\n",
+
+ CDEBUG(D_INFO, "parent for "DFID" is "DFID"\n",
PFID(ll_inode2fid(dir)), PFID(&body->fid1));
- result = ll_iget_for_nfs(dir->i_sb, &body->fid1, S_IFDIR);
+ result = ll_iget_for_nfs(dir->i_sb, &body->fid1);
ptlrpc_req_finished(req);
RETURN(result);
-}
+}
struct export_operations lustre_export_operations = {
.get_parent = ll_get_parent,
- .get_dentry = ll_get_dentry,
.encode_fh = ll_encode_fh,
+#ifdef HAVE_FH_TO_DENTRY
+ .fh_to_dentry = ll_fh_to_dentry,
+ .fh_to_parent = ll_fh_to_parent,
+#else
+ .get_dentry = ll_get_dentry,
.decode_fh = ll_decode_fh,
+#endif
};
git://git.whamcloud.com / fs / lustre-release.git / blobdiff