-/* -*- 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.
/*
* 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/
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;
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));
}
+ /**
+ * 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);
+
+ spin_lock(&lli->lli_lock);
+ lli->lli_pfid = *parent;
+ spin_unlock(&lli->lli_lock);
+ }
+
result = d_obtain_alias(inode);
- if (!result)
- RETURN(ERR_PTR(-ENOMEM));
+ if (IS_ERR(result))
+ RETURN(result);
ll_dops_init(result, 1, 0);
#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
struct dentry *child)
{
struct inode *dir = dentry->d_inode;
- struct file *filp;
struct ll_getname_data lgd;
+ __u64 offset = 0;
int rc;
ENTRY;
if (!dir->i_fop)
GOTO(out, rc = -EINVAL);
- filp = ll_dentry_open(dget(dentry), NULL, 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);
+ mutex_lock(&dir->i_mutex);
+ rc = ll_dir_read(dir, &offset, &lgd, ll_nfs_get_name_filldir);
+ mutex_unlock(&dir->i_mutex);
if (!rc && !lgd.lgd_found)
rc = -ENOENT;
EXIT;
-out_close:
- fput(filp);
out:
return rc;
}
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,
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
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
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);
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);