LU-6142 lfsck: Fix style issues under lustre/lfsck

[fs/lustre-release.git] / lustre / lfsck / lfsck_bookmark.c

diff --git a/lustre/lfsck/lfsck_bookmark.c b/lustre/lfsck/lfsck_bookmark.c
index 0aa94fa..e1efaab 100644 (file)
--- a/lustre/lfsck/lfsck_bookmark.c
+++ b/lustre/lfsck/lfsck_bookmark.c
@@ -33,6 +33,7 @@
 #include <lu_object.h>
 #include <dt_object.h>
 #include <lustre_fid.h>
+#include <lu_target.h>
 
 #include "lfsck_internal.h"
 
@@ -66,8 +67,8 @@ static int lfsck_bookmark_load(const struct lu_env *env,
                               struct lfsck_instance *lfsck)
 {
        loff_t pos = 0;
-       int    len = sizeof(struct lfsck_bookmark);
-       int    rc;
+       int len = sizeof(struct lfsck_bookmark);
+       int rc;
 
        rc = dt_record_read(env, lfsck->li_bookmark_obj,
                            lfsck_buf_get(env, &lfsck->li_bookmark_disk, len),
@@ -77,9 +78,10 @@ static int lfsck_bookmark_load(const struct lu_env *env,
 
                lfsck_bookmark_le_to_cpu(bm, &lfsck->li_bookmark_disk);
                if (bm->lb_magic != LFSCK_BOOKMARK_MAGIC) {
-                       CDEBUG(D_LFSCK, "%s: invalid lfsck_bookmark magic "
-                             "%#x != %#x\n", lfsck_lfsck2name(lfsck),
-                             bm->lb_magic, LFSCK_BOOKMARK_MAGIC);
+                       CDEBUG(D_LFSCK,
+                              "%s: invalid lfsck_bookmark magic %#x != %#x\n",
+                              lfsck_lfsck2name(lfsck), bm->lb_magic,
+                              LFSCK_BOOKMARK_MAGIC);
                        /* Process it as new lfsck_bookmark. */
                        rc = -ENODATA;
                }
@@ -88,8 +90,8 @@ static int lfsck_bookmark_load(const struct lu_env *env,
                        /* return -ENODATA for empty lfsck_bookmark. */
                        rc = -ENODATA;
                else
-                       CDEBUG(D_LFSCK, "%s: fail to load lfsck_bookmark, "
-                              "expected = %d: rc = %d\n",
+                       CDEBUG(D_LFSCK,
+                              "%s: fail to load lfsck_bookmark, expected = %d: rc = %d\n",
                               lfsck_lfsck2name(lfsck), len, rc);
        }
        return rc;
@@ -97,12 +99,13 @@ static int lfsck_bookmark_load(const struct lu_env *env,
 
 int lfsck_bookmark_store(const struct lu_env *env, struct lfsck_instance *lfsck)
 {
-       struct thandle    *handle;
-       struct dt_object  *obj    = lfsck->li_bookmark_obj;
-       struct dt_device  *dev    = lfsck_obj2dev(obj);
-       loff_t             pos    = 0;
-       int                len    = sizeof(struct lfsck_bookmark);
-       int                rc;
+       struct thandle *handle;
+       struct dt_object *obj = lfsck->li_bookmark_obj;
+       struct dt_device *dev = lfsck_obj2dev(obj);
+       loff_t pos = 0;
+       int len = sizeof(struct lfsck_bookmark);
+       int rc;
+
        ENTRY;
 
        lfsck_bookmark_cpu_to_le(&lfsck->li_bookmark_disk,
@@ -159,14 +162,14 @@ int lfsck_bookmark_setup(const struct lu_env *env,
 {
        struct dt_object *root;
        struct dt_object *obj;
-       int               rc;
-       ENTRY;
+       int rc;
 
+       ENTRY;
        root = dt_locate(env, lfsck->li_bottom, &lfsck->li_local_root_fid);
        if (IS_ERR(root))
                RETURN(PTR_ERR(root));
 
-       if (unlikely(!dt_try_as_dir(env, root))) {
+       if (unlikely(!dt_try_as_dir(env, root, true))) {
                lfsck_object_put(env, root);
 
                RETURN(-ENOTDIR);
@@ -185,7 +188,8 @@ int lfsck_bookmark_setup(const struct lu_env *env,
                struct lfsck_bookmark *mb = &lfsck->li_bookmark_ram;
 
                /* It is upgraded from old release, set it as
-                * LFSCK_ASYNC_WIN_DEFAULT to avoid memory pressure. */
+                * LFSCK_ASYNC_WIN_DEFAULT to avoid memory pressure.
+                */
                if (unlikely(mb->lb_async_windows == 0)) {
                        mb->lb_async_windows = LFSCK_ASYNC_WIN_DEFAULT;
                        mutex_lock(&lfsck->li_mutex);
@@ -202,9 +206,9 @@ int lfsck_bookmark_setup(const struct lu_env *env,
 int lfsck_set_param(const struct lu_env *env, struct lfsck_instance *lfsck,
                    struct lfsck_start *start, bool reset)
 {
-       struct lfsck_bookmark   *bk     = &lfsck->li_bookmark_ram;
-       int                      rc     = 0;
-       bool                     dirty  = false;
+       struct lfsck_bookmark *bk = &lfsck->li_bookmark_ram;
+       int rc = 0;
+       bool dirty = false;
 
        if (start == NULL) {
                LASSERT(reset);