X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fllite_nfs.c;h=1f1833759849d7344530eead98e9d2553e183a37;hb=682f3e19473b91f6face2567513b25a7b6d3fc24;hp=25352ae847db5e88ce0b63457318f7292a3d16bb;hpb=0fabe8d4962e93a0bf0207edb7c0ffe87ba21be7;p=fs%2Flustre-release.git diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c index 25352ae..1f18337 100644 --- a/lustre/llite/llite_nfs.c +++ b/lustre/llite/llite_nfs.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +26,8 @@ /* * 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/ @@ -73,7 +73,7 @@ static struct inode *search_inode_for_lustre(struct super_block *sb, struct ptlrpc_request *req = NULL; struct inode *inode = NULL; int eadatalen = 0; - unsigned long hash = (unsigned long) 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; @@ -114,8 +114,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; @@ -131,30 +136,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_has_smd && + 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 @@ -186,6 +195,54 @@ 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 ll_getname_data lgd; + __u64 offset = 0; + int rc; + ENTRY; + + if (!dir || !S_ISDIR(dir->i_mode)) + GOTO(out, rc = -ENOTDIR); + + if (!dir->i_fop) + GOTO(out, 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_dir_read(dir, &offset, &lgd, ll_nfs_get_name_filldir); + cfs_mutex_unlock(&dir->i_mutex); + if (!rc && !lgd.lgd_found) + rc = -ENOENT; + EXIT; + +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) @@ -195,7 +252,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, @@ -206,7 +263,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 @@ -238,11 +295,10 @@ 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 @@ -268,8 +324,8 @@ static struct dentry *ll_get_parent(struct dentry *dchild) 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)); + if (IS_ERR(op_data)) + RETURN((void *)op_data); rc = md_getattr_name(sbi->ll_md_exp, op_data, &req); ll_finish_md_op_data(op_data); @@ -283,7 +339,7 @@ static struct dentry *ll_get_parent(struct dentry *dchild) 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); @@ -292,6 +348,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,