X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fllite_nfs.c;h=7f3f56bd88ba8c778ba5638f3ea2d49aa598ad73;hb=a80cacd8184639aaddd615437f3ff976e9b91b62;hp=a2ce9593fc489ce53f0f3dc852ee011fb76c59d9;hpb=6dbf1ffdec1240fbc8a86210b439d31a6c80c8de;p=fs%2Flustre-release.git diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c index a2ce959..7f3f56b 100644 --- a/lustre/llite/llite_nfs.c +++ b/lustre/llite/llite_nfs.c @@ -26,8 +26,11 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011 Whamcloud, Inc. + * */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -72,15 +75,15 @@ static struct inode *search_inode_for_lustre(struct super_block *sb, 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 = cl_fid_build_ino(fid); + unsigned long hash = (unsigned long) cl_fid_build_ino(fid, 0); + struct md_op_data *op_data; int rc; ENTRY; - CDEBUG(D_INFO, "searching inode for:(%lu,"DFID")\n", ino, PFID(fid)); + CDEBUG(D_INFO, "searching inode for:(%lu,"DFID")\n", hash, PFID(fid)); - inode = ILOOKUP(sb, ino, ll_nfs_test_inode, fid); + inode = ilookup5(sb, hash, ll_nfs_test_inode, (void *)fid); if (inode) RETURN(inode); @@ -88,16 +91,24 @@ static struct inode *search_inode_for_lustre(struct super_block *sb, 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; /* mds_fid2dentry ignores f_type */ - rc = md_getattr(sbi->ll_md_exp, fid, NULL, valid, eadatalen, &req); + 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) @@ -106,8 +117,13 @@ static struct inode *search_inode_for_lustre(struct super_block *sb, RETURN(inode); } -static struct dentry *ll_iget_for_nfs(struct super_block *sb, - const struct lu_fid *fid) +struct lustre_nfs_fid { + struct lu_fid lnf_child; + struct lu_fid lnf_parent; +}; + +static struct dentry * +ll_iget_for_nfs(struct super_block *sb, struct lu_fid *fid, struct lu_fid *parent) { struct inode *inode; struct dentry *result; @@ -123,30 +139,34 @@ static struct dentry *ll_iget_for_nfs(struct super_block *sb, if (is_bad_inode(inode)) { /* we didn't find the right inode.. */ - CERROR("can't get inode by fid "DFID"\n", - PFID(fid)); iput(inode); RETURN(ERR_PTR(-ESTALE)); } - result = d_obtain_alias(inode); - if (!result) { - iput(inode); - RETURN(ERR_PTR(-ENOMEM)); + /** + * It is an anonymous dentry without OST objects created yet. + * We have to find the parent to tell MDS how to init lov objects. + */ + if (S_ISREG(inode->i_mode) && ll_i2info(inode)->lli_smd == NULL && + parent != NULL) { + struct ll_inode_info *lli = ll_i2info(inode); + + cfs_spin_lock(&lli->lli_lock); + lli->lli_pfid = *parent; + cfs_spin_unlock(&lli->lli_lock); } - ll_dops_init(result, 1); + result = d_obtain_alias(inode); + if (IS_ERR(result)) + RETURN(result); + + ll_dops_init(result, 1, 0); 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 @@ -178,6 +198,64 @@ static int ll_encode_fh(struct dentry *de, __u32 *fh, int *plen, RETURN(LUSTRE_NFS_FID); } +static int ll_nfs_get_name_filldir(void *cookie, const char *name, int namelen, + loff_t hash, u64 ino, unsigned type) +{ + /* It is hack to access lde_fid for comparison with lgd_fid. + * So the input 'name' must be part of the 'lu_dirent'. */ + struct lu_dirent *lde = container_of0(name, struct lu_dirent, lde_name); + struct ll_getname_data *lgd = cookie; + struct lu_fid fid; + + fid_le_to_cpu(&fid, &lde->lde_fid); + if (lu_fid_eq(&fid, &lgd->lgd_fid)) { + memcpy(lgd->lgd_name, name, namelen); + lgd->lgd_name[namelen] = 0; + lgd->lgd_found = 1; + } + return lgd->lgd_found; +} + +static int ll_get_name(struct dentry *dentry, char *name, + struct dentry *child) +{ + struct inode *dir = dentry->d_inode; + struct file *filp; + struct ll_getname_data lgd; + int rc; + ENTRY; + + if (!dir || !S_ISDIR(dir->i_mode)) + GOTO(out, rc = -ENOTDIR); + + if (!dir->i_fop) + GOTO(out, rc = -EINVAL); + + filp = ll_dentry_open(dget(dentry), mntget(ll_i2sbi(dir)->ll_mnt), + O_RDONLY, current_cred()); + if (IS_ERR(filp)) + GOTO(out, rc = PTR_ERR(filp)); + + if (!filp->f_op->readdir) + GOTO(out_close, rc = -EINVAL); + + lgd.lgd_name = name; + lgd.lgd_fid = ll_i2info(child->d_inode)->lli_fid; + lgd.lgd_found = 0; + + cfs_mutex_lock(&dir->i_mutex); + rc = ll_readdir(filp, &lgd, ll_nfs_get_name_filldir); + cfs_mutex_unlock(&dir->i_mutex); + if (!rc && !lgd.lgd_found) + rc = -ENOENT; + EXIT; + +out_close: + fput(filp); +out: + return rc; +} + #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) @@ -187,7 +265,7 @@ static struct dentry *ll_fh_to_dentry(struct super_block *sb, struct fid *fid, if (fh_type != LUSTRE_NFS_FID) RETURN(ERR_PTR(-EPROTO)); - RETURN(ll_iget_for_nfs(sb, &nfs_fid->lnf_child)); + RETURN(ll_iget_for_nfs(sb, &nfs_fid->lnf_child, &nfs_fid->lnf_parent)); } static struct dentry *ll_fh_to_parent(struct super_block *sb, struct fid *fid, @@ -198,7 +276,7 @@ static struct dentry *ll_fh_to_parent(struct super_block *sb, struct fid *fid, if (fh_type != LUSTRE_NFS_FID) RETURN(ERR_PTR(-EPROTO)); - RETURN(ll_iget_for_nfs(sb, &nfs_fid->lnf_parent)); + RETURN(ll_iget_for_nfs(sb, &nfs_fid->lnf_parent, NULL)); } #else @@ -230,15 +308,13 @@ static struct dentry *ll_decode_fh(struct super_block *sb, __u32 *fh, int fh_len static struct dentry *ll_get_dentry(struct super_block *sb, void *data) { - struct lustre_nfs_fid *fid = data; - struct dentry *entry; + struct dentry *entry; ENTRY; - entry = ll_iget_for_nfs(sb, &fid->lnf_child); + entry = ll_iget_for_nfs(sb, data, NULL); RETURN(entry); } #endif - static struct dentry *ll_get_parent(struct dentry *dchild) { struct ptlrpc_request *req = NULL; @@ -247,6 +323,7 @@ static struct dentry *ll_get_parent(struct dentry *dchild) struct dentry *result = NULL; struct mdt_body *body; static char dotdot[] = ".."; + struct md_op_data *op_data; int rc; ENTRY; @@ -254,12 +331,17 @@ static struct dentry *ll_get_parent(struct dentry *dchild) 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)); @@ -267,10 +349,10 @@ static struct dentry *ll_get_parent(struct dentry *dchild) 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); + result = ll_iget_for_nfs(dir->i_sb, &body->fid1, NULL); ptlrpc_req_finished(req); RETURN(result); @@ -279,6 +361,7 @@ static struct dentry *ll_get_parent(struct dentry *dchild) struct export_operations lustre_export_operations = { .get_parent = ll_get_parent, .encode_fh = ll_encode_fh, + .get_name = ll_get_name, #ifdef HAVE_FH_TO_DENTRY .fh_to_dentry = ll_fh_to_dentry, .fh_to_parent = ll_fh_to_parent,