Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-5855 lfsck: misc fixes for zfs-based backend
[fs/lustre-release.git]
/
lustre
/
mdd
/
mdd_dir.c
diff --git
a/lustre/mdd/mdd_dir.c
b/lustre/mdd/mdd_dir.c
index
d6bb84b
..
d651bc1
100644
(file)
--- a/
lustre/mdd/mdd_dir.c
+++ b/
lustre/mdd/mdd_dir.c
@@
-1842,19
+1842,9
@@
static int mdd_object_initialize(const struct lu_env *env,
struct lu_attr *attr, struct thandle *handle,
const struct md_op_spec *spec)
{
struct lu_attr *attr, struct thandle *handle,
const struct md_op_spec *spec)
{
- int rc;
- ENTRY;
-
- /*
- * Update attributes for child.
- *
- * FIXME:
- * (1) the valid bits should be converted between Lustre and Linux;
- * (2) maybe, the child attributes should be set in OSD when creation.
- */
+ int rc = 0;
+ ENTRY;
- rc = mdd_attr_set_internal(env, child, attr, handle, 0);
- /* arguments are supposed to stay the same */
if (S_ISDIR(attr->la_mode)) {
/* Add "." and ".." for newly created dir */
mdo_ref_add(env, child, handle);
if (S_ISDIR(attr->la_mode)) {
/* Add "." and ".." for newly created dir */
mdo_ref_add(env, child, handle);
@@
-2344,7
+2334,7
@@
static int mdd_create(const struct lu_env *env, struct md_object *pobj,
mdd_object_make_hint(env, mdd_pobj, son, attr, spec, hint);
memset(ldata, 0, sizeof(*ldata));
mdd_object_make_hint(env, mdd_pobj, son, attr, spec, hint);
memset(ldata, 0, sizeof(*ldata));
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT
2
)) {
+ if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT)) {
struct lu_fid tfid = *mdd_object_fid(mdd_pobj);
tfid.f_oid--;
struct lu_fid tfid = *mdd_object_fid(mdd_pobj);
tfid.f_oid--;