X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fllite_nfs.c;h=3dd11838ec3fd24aba8cfc97c4b897798fed3d42;hp=2df61f6c0c28c05a9ab270127f60834360e4bc1d;hb=0d8c5ccc4ecfe7c0d10a0a4f92fd291320a97190;hpb=abe4d83fab003e27118cc51f007cba32a6cc8413

diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c
index 2df61f6..3dd1183 100644
--- a/lustre/llite/llite_nfs.c
+++ b/lustre/llite/llite_nfs.c
@@ -58,12 +58,6 @@ __u32 get_uuid2int(const char *name, int len)
         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)
 {
@@ -79,13 +73,13 @@ struct inode *search_inode_for_lustre(struct super_block *sb,
 
         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 */
@@ -101,8 +95,10 @@ struct inode *search_inode_for_lustre(struct super_block *sb,
         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);
+		/* Suppress erroneous/confusing messages when NFS
+		 * is out of sync and requests old data. */
+		CDEBUG(D_INFO, "can't get object attrs, fid "DFID", rc %d\n",
+				PFID(fid), rc);
                 RETURN(ERR_PTR(rc));
         }
         rc = ll_prep_inode(&inode, req, sb, NULL);
@@ -125,9 +121,10 @@ ll_iget_for_nfs(struct super_block *sb, struct lu_fid *fid, struct lu_fid *paren
         struct dentry *result;
         ENTRY;
 
-        CDEBUG(D_INFO, "Get dentry for fid: "DFID"\n", PFID(fid));
-        if (!fid_is_sane(fid))
-                RETURN(ERR_PTR(-ESTALE));
+	if (!fid_is_sane(fid))
+		RETURN(ERR_PTR(-ESTALE));
+
+	CDEBUG(D_INFO, "Get dentry for fid: "DFID"\n", PFID(fid));
 
         inode = search_inode_for_lustre(sb, fid);
         if (IS_ERR(inode))
@@ -144,7 +141,7 @@ ll_iget_for_nfs(struct super_block *sb, struct lu_fid *fid, struct lu_fid *paren
          * 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) {
+	    parent != NULL && !fid_is_zero(parent)) {
 		struct ll_inode_info *lli = ll_i2info(inode);
 
 		spin_lock(&lli->lli_lock);
@@ -161,7 +158,12 @@ ll_iget_for_nfs(struct super_block *sb, struct lu_fid *fid, struct lu_fid *paren
         RETURN(result);
 }
 
-#define LUSTRE_NFS_FID          0x97
+#ifndef FILEID_INVALID
+#define FILEID_INVALID 0xff
+#endif
+#ifndef FILEID_LUSTRE
+#define FILEID_LUSTRE  0x97
+#endif
 
 /**
  * \a connectable - is nfsd will connect himself or this should be done
@@ -183,21 +185,27 @@ static int ll_encode_fh(struct inode *inode, __u32 *fh, int *plen,
 			struct inode *parent)
 {
 #endif
+	int fileid_len = sizeof(struct lustre_nfs_fid) / 4;
 	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));
+	CDEBUG(D_INFO, "%s: encoding for ("DFID") maxlen=%d minlen=%d\n",
+	       ll_get_fsname(inode->i_sb, NULL, 0),
+	       PFID(ll_inode2fid(inode)), *plen, fileid_len);
 
-	if (*plen < sizeof(struct lustre_nfs_fid) / 4)
-		RETURN(255);
+	if (*plen < fileid_len) {
+		*plen = fileid_len;
+		RETURN(FILEID_INVALID);
+	}
 
 	nfs_fid->lnf_child = *ll_inode2fid(inode);
-	nfs_fid->lnf_parent = *ll_inode2fid(parent);
-	*plen = sizeof(struct lustre_nfs_fid) / 4;
+	if (parent != NULL)
+		nfs_fid->lnf_parent = *ll_inode2fid(parent);
+	else
+		fid_zero(&nfs_fid->lnf_parent);
+	*plen = fileid_len;
 
-	RETURN(LUSTRE_NFS_FID);
+	RETURN(FILEID_LUSTRE);
 }
 
 static int ll_nfs_get_name_filldir(void *cookie, const char *name, int namelen,
@@ -221,11 +229,18 @@ static int ll_nfs_get_name_filldir(void *cookie, const char *name, int namelen,
 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;
+	struct inode *dir = dentry->d_inode;
+	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;
+	int rc;
+	ENTRY;
 
         if (!dir || !S_ISDIR(dir->i_mode))
                 GOTO(out, rc = -ENOTDIR);
@@ -233,19 +248,26 @@ static int ll_get_name(struct dentry *dentry, char *name,
         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_pages;
 	mutex_lock(&dir->i_mutex);
-	rc = ll_dir_read(dir, &offset, &lgd, ll_nfs_get_name_filldir);
+#ifdef HAVE_DIR_CONTEXT
+	rc = ll_dir_read(dir, op_data, &lgd.ctx);
+#else
+	rc = ll_dir_read(dir, op_data, &lgd, ll_nfs_get_name_filldir);
+#endif
 	mutex_unlock(&dir->i_mutex);
-        if (!rc && !lgd.lgd_found)
-                rc = -ENOENT;
-        EXIT;
-
+	ll_finish_md_op_data(op_data);
+	if (!rc && !lgd.lgd_found)
+		rc = -ENOENT;
+	EXIT;
 out:
-        return rc;
+	return rc;
 }
 
 static struct dentry *ll_fh_to_dentry(struct super_block *sb, struct fid *fid,
@@ -253,8 +275,8 @@ static struct dentry *ll_fh_to_dentry(struct super_block *sb, struct fid *fid,
 {
         struct lustre_nfs_fid *nfs_fid = (struct lustre_nfs_fid *)fid;
 
-        if (fh_type != LUSTRE_NFS_FID)
-                RETURN(ERR_PTR(-EPROTO));
+	if (fh_type != FILEID_LUSTRE)
+		RETURN(ERR_PTR(-EPROTO));
 
         RETURN(ll_iget_for_nfs(sb, &nfs_fid->lnf_child, &nfs_fid->lnf_parent));
 }
@@ -264,57 +286,79 @@ static struct dentry *ll_fh_to_parent(struct super_block *sb, struct fid *fid,
 {
         struct lustre_nfs_fid *nfs_fid = (struct lustre_nfs_fid *)fid;
 
-        if (fh_type != LUSTRE_NFS_FID)
-                RETURN(ERR_PTR(-EPROTO));
+	if (fh_type != FILEID_LUSTRE)
+		RETURN(ERR_PTR(-EPROTO));
 
         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, "getting parent for (%lu,"DFID")\n",
-                        dir->i_ino, PFID(ll_inode2fid(dir)));
+	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);
+				     LUSTRE_OPC_ANY, NULL);
+	if (IS_ERR(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 != 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(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) {
+		CDEBUG(D_INFO, "parent for "DFID" is "DFID"\n",
+		       PFID(ll_inode2fid(dir)), PFID(&body->fid1));
+		*parent_fid = body->fid1;
+	}
 
-        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);
+	ptlrpc_req_finished(req);
+	RETURN(0);
+}
 
-        CDEBUG(D_INFO, "parent for "DFID" is "DFID"\n",
-                PFID(ll_inode2fid(dir)), PFID(&body->fid1));
+static struct dentry *ll_get_parent(struct dentry *dchild)
+{
+	struct lu_fid	parent_fid = { 0 };
+	int		rc;
+	struct dentry	*dentry;
+	ENTRY;
 
-        result = ll_iget_for_nfs(dir->i_sb, &body->fid1, NULL);
+	rc = ll_dir_get_parent_fid(dchild->d_inode, &parent_fid);
+	if (rc != 0)
+		RETURN(ERR_PTR(rc));
 
-        ptlrpc_req_finished(req);
-        RETURN(result);
+	dentry = ll_iget_for_nfs(dchild->d_inode->i_sb, &parent_fid, NULL);
+
+	RETURN(dentry);
 }
 
 struct export_operations lustre_export_operations = {