* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
#define DEBUG_SUBSYSTEM S_LLITE
-#include <lustre_lite.h>
#include "llite_internal.h"
#include <linux/exportfs.h>
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);
-}
-
struct inode *search_inode_for_lustre(struct super_block *sb,
const struct lu_fid *fid)
{
CDEBUG(D_INFO, "searching inode for:(%lu,"DFID")\n", hash, PFID(fid));
- inode = ilookup5(sb, hash, ll_nfs_test_inode, (void *)fid);
- if (inode)
- RETURN(inode);
+ inode = ilookup5(sb, hash, ll_test_inode_by_fid, (void *)fid);
+ if (inode)
+ RETURN(inode);
- rc = ll_get_max_mdsize(sbi, &eadatalen);
- if (rc)
- RETURN(ERR_PTR(rc));
+ rc = ll_get_default_mdsize(sbi, &eadatalen);
+ if (rc)
+ RETURN(ERR_PTR(rc));
/* Because inode is NULL, ll_prep_md_op_data can not
* be used here. So we allocate op_data ourselves */
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 && !fid_is_zero(parent)) {
- 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 (IS_ERR(result)) {
iput(inode);
RETURN(FILEID_LUSTRE);
}
-static int ll_nfs_get_name_filldir(void *cookie, const char *name, int namelen,
- loff_t hash, u64 ino, unsigned type)
+static int
+#ifndef HAVE_FILLDIR_USE_CTX
+ll_nfs_get_name_filldir(void *cookie, const char *name, int namelen,
+ loff_t hash, u64 ino, unsigned type)
{
+ struct ll_getname_data *lgd = cookie;
+#else
+ll_nfs_get_name_filldir(struct dir_context *ctx, const char *name, int namelen,
+ loff_t hash, u64 ino, unsigned type)
+{
+ struct ll_getname_data *lgd =
+ container_of(ctx, struct ll_getname_data, ctx);
+#endif /* HAVE_FILLDIR_USE_CTX */
/* 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);
struct dentry *child)
{
struct inode *dir = dentry->d_inode;
- struct ll_getname_data lgd;
+ struct ll_getname_data lgd = {
+ .lgd_name = name,
+ .lgd_fid = ll_i2info(child->d_inode)->lli_fid,
+#ifdef HAVE_DIR_CONTEXT
+ .ctx.actor = ll_nfs_get_name_filldir,
+#endif
+ .lgd_found = 0,
+ };
struct md_op_data *op_data;
+ __u64 pos = 0;
int rc;
ENTRY;
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;
-
op_data = ll_prep_md_op_data(NULL, dir, dir, NULL, 0, 0,
LUSTRE_OPC_ANY, dir);
if (IS_ERR(op_data))
GOTO(out, rc = PTR_ERR(op_data));
- op_data->op_hash_offset = 0;
- op_data->op_max_pages =
- ll_i2sbi(dir)->ll_md_brw_size >> PAGE_CACHE_SHIFT;
+ op_data->op_max_pages = ll_i2sbi(dir)->ll_md_brw_pages;
mutex_lock(&dir->i_mutex);
- rc = ll_dir_read(dir, op_data, &lgd, ll_nfs_get_name_filldir);
+#ifdef HAVE_DIR_CONTEXT
+ rc = ll_dir_read(dir, &pos, op_data, &lgd.ctx);
+#else
+ rc = ll_dir_read(dir, &pos, op_data, &lgd, ll_nfs_get_name_filldir);
+#endif
mutex_unlock(&dir->i_mutex);
ll_finish_md_op_data(op_data);
if (!rc && !lgd.lgd_found)
RETURN(ll_iget_for_nfs(sb, &nfs_fid->lnf_parent, NULL));
}
-static struct dentry *ll_get_parent(struct dentry *dchild)
+int ll_dir_get_parent_fid(struct inode *dir, struct lu_fid *parent_fid)
{
- struct ptlrpc_request *req = NULL;
- struct inode *dir = dchild->d_inode;
- struct ll_sb_info *sbi;
- struct dentry *result = NULL;
- struct mdt_body *body;
- static char dotdot[] = "..";
- struct md_op_data *op_data;
- int rc;
- int lmmsize;
- ENTRY;
+ struct ptlrpc_request *req = NULL;
+ struct ll_sb_info *sbi;
+ struct mdt_body *body;
+ static const char dotdot[] = "..";
+ struct md_op_data *op_data;
+ int rc;
+ int lmmsize;
+ ENTRY;
- LASSERT(dir && S_ISDIR(dir->i_mode));
+ LASSERT(dir && S_ISDIR(dir->i_mode));
- sbi = ll_s2sbi(dir->i_sb);
+ sbi = ll_s2sbi(dir->i_sb);
CDEBUG(D_INFO, "%s: getting parent for ("DFID")\n",
ll_get_fsname(dir->i_sb, NULL, 0),
PFID(ll_inode2fid(dir)));
- rc = ll_get_max_mdsize(sbi, &lmmsize);
+ rc = ll_get_default_mdsize(sbi, &lmmsize);
if (rc != 0)
- RETURN(ERR_PTR(rc));
+ RETURN(rc);
op_data = ll_prep_md_op_data(NULL, dir, NULL, dotdot,
strlen(dotdot), lmmsize,
LUSTRE_OPC_ANY, NULL);
if (IS_ERR(op_data))
- RETURN((void *)op_data);
+ RETURN(PTR_ERR(op_data));
rc = md_getattr_name(sbi->ll_md_exp, op_data, &req);
ll_finish_md_op_data(op_data);
- if (rc) {
+ if (rc != 0) {
CERROR("%s: failure inode "DFID" get parent: rc = %d\n",
ll_get_fsname(dir->i_sb, NULL, 0),
PFID(ll_inode2fid(dir)), rc);
- RETURN(ERR_PTR(rc));
+ RETURN(rc);
}
body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
+
/*
* LU-3952: MDT may lost the FID of its parent, we should not crash
* the NFS server, ll_iget_for_nfs() will handle the error.
*/
- if (body->valid & OBD_MD_FLID) {
+ if (body->mbo_valid & OBD_MD_FLID) {
CDEBUG(D_INFO, "parent for "DFID" is "DFID"\n",
- PFID(ll_inode2fid(dir)), PFID(&body->fid1));
+ PFID(ll_inode2fid(dir)), PFID(&body->mbo_fid1));
+ *parent_fid = body->mbo_fid1;
}
- result = ll_iget_for_nfs(dir->i_sb, &body->fid1, NULL);
ptlrpc_req_finished(req);
- RETURN(result);
+ RETURN(0);
+}
+
+static struct dentry *ll_get_parent(struct dentry *dchild)
+{
+ struct lu_fid parent_fid = { 0 };
+ int rc;
+ struct dentry *dentry;
+ ENTRY;
+
+ rc = ll_dir_get_parent_fid(dchild->d_inode, &parent_fid);
+ if (rc != 0)
+ RETURN(ERR_PTR(rc));
+
+ dentry = ll_iget_for_nfs(dchild->d_inode->i_sb, &parent_fid, NULL);
+
+ RETURN(dentry);
}
struct export_operations lustre_export_operations = {
git://git.whamcloud.com / fs / lustre-release.git / blobdiff