LU-4659 mdd: rename forgets updating target linkea

MDD rename forgets updating target LinkEA if target is not unlinked,
which will cause LinkEA inconsistency.

Signed-off-by: Lai Siyao <lai.siyao@intel.com>
Change-Id: I9d42960da2d07d551ce08baed925bc25218fc0a4
Reviewed-on: http://review.whamcloud.com/9745
Tested-by: Jenkins
Reviewed-by: Fan Yong <fan.yong@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c
index 1bc386a..a524f27 100644 (file)
--- a/lustre/mdd/mdd_dir.c
+++ b/lustre/mdd/mdd_dir.c
@@ -1322,16 +1322,22 @@ static int mdd_declare_finish_unlink(const struct lu_env *env,
        int     rc;
 
        rc = orph_declare_index_insert(env, obj, mdd_object_type(obj), handle);
        int     rc;
 
        rc = orph_declare_index_insert(env, obj, mdd_object_type(obj), handle);

-       if (rc)
+       if (rc != 0)
+               return rc;
+
+       rc = mdo_declare_destroy(env, obj, handle);
+       if (rc != 0)

                return rc;
 
                return rc;
 

-       return mdo_declare_destroy(env, obj, handle);
+       return mdd_declare_links_del(env, obj, handle);

 }
 
 /* caller should take a lock before calling */
 int mdd_finish_unlink(const struct lu_env *env,
 }
 
 /* caller should take a lock before calling */
 int mdd_finish_unlink(const struct lu_env *env,

-                      struct mdd_object *obj, struct md_attr *ma,
-                      struct thandle *th)
+                     struct mdd_object *obj, struct md_attr *ma,
+                     const struct mdd_object *pobj,
+                     const struct lu_name *lname,
+                     struct thandle *th)

 {
        int rc = 0;
         int is_dir = S_ISDIR(ma->ma_attr.la_mode);
 {
        int rc = 0;
         int is_dir = S_ISDIR(ma->ma_attr.la_mode);


@@ -1360,9 +1366,12 @@ int mdd_finish_unlink(const struct lu_env *env,
                 } else {
                        rc = mdo_destroy(env, obj, th);
                 }
                 } else {
                        rc = mdo_destroy(env, obj, th);
                 }

-        }
+       } else if (!is_dir) {
+               /* old files may not have link ea; ignore errors */
+               mdd_links_del(env, obj, mdo2fid(pobj), lname, th);
+       }

 
 

-        RETURN(rc);
+       RETURN(rc);

 }
 
 /*
 }
 
 /*


@@ -1425,10 +1434,6 @@ static int mdd_declare_unlink(const struct lu_env *env, struct mdd_device *mdd,
                if (rc)
                        return rc;
 
                if (rc)
                        return rc;
 

-               rc = mdd_declare_links_del(env, c, handle);
-               if (rc != 0)
-                       return rc;
-

                /* FIXME: need changelog for remove entry */
                rc = mdd_declare_changelog_store(env, mdd, name, handle);
        }
                /* FIXME: need changelog for remove entry */
                rc = mdd_declare_changelog_store(env, mdd, name, handle);
        }


@@ -1584,16 +1589,12 @@ static int mdd_unlink(const struct lu_env *env, struct md_object *pobj,
        /* XXX: this transfer to ma will be removed with LOD/OSP */
        ma->ma_attr = *cattr;
        ma->ma_valid |= MA_INODE;
        /* XXX: this transfer to ma will be removed with LOD/OSP */
        ma->ma_attr = *cattr;
        ma->ma_valid |= MA_INODE;

-       rc = mdd_finish_unlink(env, mdd_cobj, ma, handle);
+       rc = mdd_finish_unlink(env, mdd_cobj, ma, mdd_pobj, lname, handle);

 
        /* fetch updated nlink */
        if (rc == 0)
                rc = mdd_la_get(env, mdd_cobj, cattr, BYPASS_CAPA);
 
 
        /* fetch updated nlink */
        if (rc == 0)
                rc = mdd_la_get(env, mdd_cobj, cattr, BYPASS_CAPA);
 

-       if (!is_dir)
-               /* old files may not have link ea; ignore errors */
-               mdd_links_del(env, mdd_cobj, mdo2fid(mdd_pobj), lname, handle);
-

        /* if object is removed then we can't get its attrs, use last get */
        if (cattr->la_nlink == 0) {
                ma->ma_attr = *cattr;
        /* if object is removed then we can't get its attrs, use last get */
        if (cattr->la_nlink == 0) {
                ma->ma_attr = *cattr;


@@ -2517,10 +2518,6 @@ static int mdd_declare_rename(const struct lu_env *env,
                if (rc)
                        return rc;
 
                if (rc)
                        return rc;
 

-               rc = mdd_declare_links_del(env, mdd_tobj, handle);
-               if (rc)
-                       return rc;
-

                rc = mdd_declare_finish_unlink(env, mdd_tobj, handle);
                if (rc)
                        return rc;
                rc = mdd_declare_finish_unlink(env, mdd_tobj, handle);
                if (rc)
                        return rc;


@@ -2709,7 +2706,8 @@ static int mdd_rename(const struct lu_env *env,
                /* XXX: this transfer to ma will be removed with LOD/OSP */
                ma->ma_attr = *tattr;
                ma->ma_valid |= MA_INODE;
                /* XXX: this transfer to ma will be removed with LOD/OSP */
                ma->ma_attr = *tattr;
                ma->ma_valid |= MA_INODE;

-               rc = mdd_finish_unlink(env, mdd_tobj, ma, handle);
+               rc = mdd_finish_unlink(env, mdd_tobj, ma, mdd_tpobj, ltname,
+                                      handle);

                if (rc != 0) {
                        CERROR("%s: Failed to unlink tobj "
                                DFID": rc = %d\n",
                if (rc != 0) {
                        CERROR("%s: Failed to unlink tobj "
                                DFID": rc = %d\n",


@@ -3740,7 +3738,7 @@ static int mdd_migrate_update_name(const struct lu_env *env,
                GOTO(stop_trans, rc);
        ma->ma_attr = *so_attr;
        ma->ma_valid |= MA_INODE;
                GOTO(stop_trans, rc);
        ma->ma_attr = *so_attr;
        ma->ma_valid |= MA_INODE;

-       rc = mdd_finish_unlink(env, mdd_sobj, ma, handle);
+       rc = mdd_finish_unlink(env, mdd_sobj, ma, mdd_pobj, lname, handle);

        if (rc != 0)
                GOTO(stop_trans, rc);
 
        if (rc != 0)
                GOTO(stop_trans, rc);
 

diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h
index b536821..a95a42c 100644 (file)
--- a/lustre/mdd/mdd_internal.h
+++ b/lustre/mdd/mdd_internal.h
@@ -275,7 +275,8 @@ int mdd_unlink_sanity_check(const struct lu_env *env, struct mdd_object *pobj,
                            struct mdd_object *cobj,
                            const struct lu_attr *cattr);
 int mdd_finish_unlink(const struct lu_env *env, struct mdd_object *obj,
                            struct mdd_object *cobj,
                            const struct lu_attr *cattr);
 int mdd_finish_unlink(const struct lu_env *env, struct mdd_object *obj,

-                      struct md_attr *ma, struct thandle *th);
+                     struct md_attr *ma, const struct mdd_object *pobj,
+                     const struct lu_name *lname, struct thandle *th);

 
 int mdd_is_root(struct mdd_device *mdd, const struct lu_fid *fid);
 int mdd_lookup(const struct lu_env *env,
 
 int mdd_is_root(struct mdd_device *mdd, const struct lu_fid *fid);
 int mdd_lookup(const struct lu_env *env,

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index ff6a319..5715d67 100644 (file)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -12246,6 +12246,23 @@ test_237() {
 }
 run_test 237 "Verify name_to_handle_at/open_by_handle_at syscalls"
 
 }
 run_test 237 "Verify name_to_handle_at/open_by_handle_at syscalls"
 

+# LU-4659 linkea consistency
+test_238() {
+       touch $DIR/$tfile
+       ln $DIR/$tfile $DIR/$tfile.lnk
+       touch $DIR/$tfile.new
+       mv $DIR/$tfile.new $DIR/$tfile
+       local fid1=$(lfs path2fid $DIR/$tfile)
+       local fid2=$(lfs path2fid $DIR/$tfile.lnk)
+       local path1=$(lfs fid2path $FSNAME $fid1)
+       [ $tfile == $path1 ] || error "linkea inconsistent: $tfile $fid1 $path1"
+       local path2=$(lfs fid2path $FSNAME $fid2)
+       [ $tfile.lnk == $path2 ] ||
+               error "linkea inconsistent: $tfile.lnk $fid2 $path2!"
+       rm -f $DIR/$tfile*
+}
+run_test 238 "Verify linkea consistency"
+

 test_striped_dir() {
        local mdt_index=$1
        local stripe_count
 test_striped_dir() {
        local mdt_index=$1
        local stripe_count