X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_device.c;h=80ff70eb4ad0fbf38cef336d9a0305a4c7256994;hp=40a4ee3db30e0b28df2d9944994c01ee80a2c46b;hb=76f0977b7ea5d46836cb459deb7b9ad9e781d585;hpb=32a11dbd310b44d2a6e084c48310f21ef6649145

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index 40a4ee3..80ff70e 100644
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -57,6 +57,7 @@ static struct lu_device_type mdd_device_type;
 
 static const char mdd_root_dir_name[] = "ROOT";
 static const char mdd_obf_dir_name[] = "fid";
+static const char mdd_lpf_dir_name[] = "lost+found";
 
 /* Slab for MDD object allocation */
 struct kmem_cache *mdd_object_kmem;
@@ -590,42 +591,61 @@ out:
         return rc;
 }
 
-static int obf_create(const struct lu_env *env, struct md_object *pobj,
-                      const struct lu_name *lname, struct md_object *child,
-                      struct md_op_spec *spec, struct md_attr* ma)
+static int mdd_dummy_create(const struct lu_env *env,
+			    struct md_object *pobj,
+			    const struct lu_name *lname,
+			    struct md_object *child,
+			    struct md_op_spec *spec,
+			    struct md_attr* ma)
 {
-        return -EPERM;
+	return -EPERM;
 }
 
-static int obf_rename(const struct lu_env *env,
-                      struct md_object *src_pobj, struct md_object *tgt_pobj,
-                      const struct lu_fid *lf, const struct lu_name *lsname,
-                      struct md_object *tobj, const struct lu_name *ltname,
-                      struct md_attr *ma)
+static int mdd_dummy_rename(const struct lu_env *env,
+			    struct md_object *src_pobj,
+			    struct md_object *tgt_pobj,
+			    const struct lu_fid *lf,
+			    const struct lu_name *lsname,
+			    struct md_object *tobj,
+			    const struct lu_name *ltname,
+			    struct md_attr *ma)
 {
-        return -EPERM;
+	return -EPERM;
 }
 
-static int obf_link(const struct lu_env *env, struct md_object *tgt_obj,
-                    struct md_object *src_obj, const struct lu_name *lname,
-                    struct md_attr *ma)
+static int mdd_dummy_link(const struct lu_env *env,
+			  struct md_object *tgt_obj,
+			  struct md_object *src_obj,
+			  const struct lu_name *lname,
+			  struct md_attr *ma)
 {
-        return -EPERM;
+	return -EPERM;
 }
 
-static int obf_unlink(const struct lu_env *env, struct md_object *pobj,
-		      struct md_object *cobj, const struct lu_name *lname,
-		      struct md_attr *ma, int no_name)
+static int mdd_dummy_unlink(const struct lu_env *env,
+			    struct md_object *pobj,
+			    struct md_object *cobj,
+			    const struct lu_name *lname,
+			    struct md_attr *ma,
+			    int no_name)
 {
 	return -EPERM;
 }
 
 static struct md_dir_operations mdd_obf_dir_ops = {
-        .mdo_lookup = obf_lookup,
-        .mdo_create = obf_create,
-        .mdo_rename = obf_rename,
-        .mdo_link   = obf_link,
-        .mdo_unlink = obf_unlink
+	.mdo_lookup = obf_lookup,
+	.mdo_create = mdd_dummy_create,
+	.mdo_rename = mdd_dummy_rename,
+	.mdo_link   = mdd_dummy_link,
+	.mdo_unlink = mdd_dummy_unlink
+};
+
+static struct md_dir_operations mdd_lpf_dir_ops = {
+	.mdo_lookup = mdd_lookup,
+	.mdo_create = mdd_dummy_create,
+	.mdo_rename = mdd_dummy_rename,
+	.mdo_link   = mdd_dummy_link,
+	.mdo_unlink = mdd_dummy_unlink
 };
 
 static struct md_object *mdo_locate(const struct lu_env *env,
@@ -646,6 +666,33 @@ static struct md_object *mdo_locate(const struct lu_env *env,
 	return mdo;
 }
 
+static int mdd_lpf_setup(const struct lu_env *env, struct mdd_device *m)
+{
+	struct md_object	*mdo;
+	struct mdd_object	*mdd_lpf;
+	struct lu_fid		 fid	= LU_LPF_FID;
+	int			 rc;
+	ENTRY;
+
+	rc = mdd_local_file_create(env, m, mdd_object_fid(m->mdd_dot_lustre),
+				   mdd_lpf_dir_name, S_IFDIR | S_IRUSR | S_IXUSR,
+				   &fid);
+	if (rc != 0)
+		RETURN(rc);
+
+	mdo = mdo_locate(env, &m->mdd_md_dev, &fid);
+	if (IS_ERR(mdo))
+		RETURN(PTR_ERR(mdo));
+
+	LASSERT(lu_object_exists(&mdo->mo_lu));
+
+	mdd_lpf = md2mdd_obj(mdo);
+	mdd_lpf->mod_obj.mo_dir_ops = &mdd_lpf_dir_ops;
+	m->mdd_dot_lustre_objs.mdd_lpf = mdd_lpf;
+
+	RETURN(0);
+}
+
 /**
  * Create special in-memory "fid" object for open-by-fid.
  */
@@ -674,6 +721,23 @@ static int mdd_obf_setup(const struct lu_env *env, struct mdd_device *m)
 	return 0;
 }
 
+static void mdd_dot_lustre_cleanup(const struct lu_env *env,
+				   struct mdd_device *m)
+{
+	if (m->mdd_dot_lustre_objs.mdd_lpf != NULL) {
+		mdd_object_put(env, m->mdd_dot_lustre_objs.mdd_lpf);
+		m->mdd_dot_lustre_objs.mdd_lpf = NULL;
+	}
+	if (m->mdd_dot_lustre_objs.mdd_obf != NULL) {
+		mdd_object_put(env, m->mdd_dot_lustre_objs.mdd_obf);
+		m->mdd_dot_lustre_objs.mdd_obf = NULL;
+	}
+	if (m->mdd_dot_lustre != NULL) {
+		mdd_object_put(env, m->mdd_dot_lustre);
+		m->mdd_dot_lustre = NULL;
+	}
+}
+
 /** Setup ".lustre" directory object */
 static int mdd_dot_lustre_setup(const struct lu_env *env, struct mdd_device *m)
 {
@@ -703,10 +767,19 @@ static int mdd_dot_lustre_setup(const struct lu_env *env, struct mdd_device *m)
 		       mdd2obd_dev(m)->obd_name, rc);
 		GOTO(out, rc);
 	}
+
+	rc = mdd_lpf_setup(env, m);
+	if (rc != 0) {
+		CERROR("%s: error initializing \"lost+found\": rc = %d.\n",
+		       mdd2obd_dev(m)->obd_name, rc);
+		GOTO(out, rc);
+	}
+
 	RETURN(0);
+
 out:
-	mdd_object_put(env, m->mdd_dot_lustre);
-	m->mdd_dot_lustre = NULL;
+	mdd_dot_lustre_cleanup(env, m);
+
 	return rc;
 }
 
@@ -790,10 +863,7 @@ static void mdd_device_shutdown(const struct lu_env *env, struct mdd_device *m,
 	mdd_hsm_actions_llog_fini(env, m);
 	mdd_changelog_fini(env, m);
 	orph_index_fini(env, m);
-	if (m->mdd_dot_lustre_objs.mdd_obf)
-		mdd_object_put(env, m->mdd_dot_lustre_objs.mdd_obf);
-	if (m->mdd_dot_lustre)
-		mdd_object_put(env, m->mdd_dot_lustre);
+	mdd_dot_lustre_cleanup(env, m);
 	if (m->mdd_los != NULL)
 		local_oid_storage_fini(env, m->mdd_los);
 	lu_site_purge(env, mdd2lu_dev(m)->ld_site, ~0);
@@ -947,9 +1017,8 @@ static int mdd_prepare(const struct lu_env *env,
 		}
 
 		rc = mdd_compat_fixes(env, mdd);
-		if (rc)
-			GOTO(out_los, rc);
-
+		if (rc != 0)
+			GOTO(out_dot, rc);
 	} else {
 		/* Normal client usually send root access to MDT0 directly,
 		 * the root FID on non-MDT0 will only be used by echo client. */
@@ -987,12 +1056,8 @@ out_changelog:
 out_orph:
 	orph_index_fini(env, mdd);
 out_dot:
-	if (mdd_seq_site(mdd)->ss_node_id == 0) {
-		mdd_object_put(env, mdd->mdd_dot_lustre);
-		mdd->mdd_dot_lustre = NULL;
-		mdd_object_put(env, mdd->mdd_dot_lustre_objs.mdd_obf);
-		mdd->mdd_dot_lustre_objs.mdd_obf = NULL;
-	}
+	if (mdd_seq_site(mdd)->ss_node_id == 0)
+		mdd_dot_lustre_cleanup(env, mdd);
 out_los:
 	local_oid_storage_fini(env, mdd->mdd_los);
 	mdd->mdd_los = NULL;