staging/lustre: Fix indentation mistakes

none look like bugs or bugs-inducing, mostly just
off by a couple of spaces all around.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h b/drivers/staging/lustre/lustre/include/lprocfs_status.h
index eb693a100cc70ce1d49d16e95f0f7c67172b987c..0d98111b39375a020cfc5adec59f1b8cd95d3f64 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h
@@ -276,7 +276,7 @@ static inline int opcode_offset(__u32 opc)
                        OPC_RANGE(OST));
        } else if (opc < FLD_LAST_OPC) {
                /* FLD opcode */
-                return (opc - FLD_FIRST_OPC +
+               return (opc - FLD_FIRST_OPC +
                        OPC_RANGE(SEC) +
                        OPC_RANGE(SEQ) +
                        OPC_RANGE(QUOTA) +

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index e32163bdab3fb974cdd896cdc7cdc8fc0b715573..284affbeb55c9bd196b449c8c2a469dd900c0c20 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -700,9 +700,9 @@ static inline int ostid_to_fid(struct lu_fid *fid, struct ost_id *ostid,
                 * of 1M objects/s/OST for 9 years, or combinations thereof.
                 */
                if (ostid_id(ostid) >= IDIF_MAX_OID) {
-                        CERROR("bad MDT0 id, "DOSTID" ost_idx:%u\n",
-                               POSTID(ostid), ost_idx);
-                        return -EBADF;
+                       CERROR("bad MDT0 id, " DOSTID " ost_idx:%u\n",
+                              POSTID(ostid), ost_idx);
+                       return -EBADF;
                }
                fid->f_seq = fid_idif_seq(ostid_id(ostid), ost_idx);
                /* truncate to 32 bits by assignment */
@@ -3154,7 +3154,7 @@ static inline void lustre_get_wire_obdo(struct obd_connect_data *ocd,
        __u32 local_flags = 0;
 
        if (lobdo->o_valid & OBD_MD_FLFLAGS)
-                local_flags = lobdo->o_flags & OBD_FL_LOCAL_MASK;
+               local_flags = lobdo->o_flags & OBD_FL_LOCAL_MASK;
 
        *lobdo = *wobdo;
        if (local_flags != 0) {

diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
index 60c40ca9f36e9409f8c00bac451b103e4e6fdfcb..2e9f0259a44684f17c47b2f8fa6fea424c15961d 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_user.h
@@ -473,7 +473,7 @@ static inline void obd_uuid2fsname(char *buf, char *uuid, int buflen)
        buf[buflen - 1] = '\0';
        p = strrchr(buf, '-');
        if (p)
-          *p = '\0';
+               *p = '\0';
 }
 
 /* printf display format

diff --git a/drivers/staging/lustre/lustre/llite/llite_mmap.c b/drivers/staging/lustre/lustre/llite/llite_mmap.c
index d8c39fbcbdfe81b583b53413cff13e0379e48ba8..31abdb7fd405def539251feffae4d9c7fc605ae9 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/llite_mmap.c
+++ b/drivers/staging/lustre/lustre/llite/llite_mmap.c
@@ -119,7 +119,7 @@ ll_fault_io_init(struct vm_area_struct *vma, struct lu_env **env_ret,
         */
        env = cl_env_nested_get(nest);
        if (IS_ERR(env))
-                return ERR_PTR(-EINVAL);
+               return ERR_PTR(-EINVAL);
 
        *env_ret = env;
 

diff --git a/drivers/staging/lustre/lustre/llite/rw.c b/drivers/staging/lustre/lustre/llite/rw.c
index d685c8f6776438c73ae07a079a68fbe42f7f128a..0e5bd4f1ec52cb24e84fb06367c53c200177e2e3 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/rw.c
+++ b/drivers/staging/lustre/lustre/llite/rw.c
@@ -381,9 +381,9 @@ static int index_in_window(unsigned long index, unsigned long point,
        unsigned long start = point - before, end = point + after;
 
        if (start > point)
-              start = 0;
+               start = 0;
        if (end < point)
-              end = ~0;
+               end = ~0;
 
        return start <= index && index <= end;
 }

diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index 89fd5139feeaf9097bf504575da7d0505130a54e..b0f7ffa73f4742ae88deb5f6f5d19d2849dc5594 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -248,7 +248,7 @@ ssize_t ll_direct_rw_pages(const struct lu_env *env, struct cl_io *io,
        cl_2queue_init(queue);
        for (i = 0; i < page_count; i++) {
                if (pv->ldp_offsets)
-                   file_offset = pv->ldp_offsets[i];
+                       file_offset = pv->ldp_offsets[i];
 
                LASSERT(!(file_offset & (page_size - 1)));
                clp = cl_page_find(env, obj, cl_index(obj, file_offset),

diff --git a/drivers/staging/lustre/lustre/lov/lov_obd.c b/drivers/staging/lustre/lustre/lov/lov_obd.c
index b1ac13a21830521ee5dbc73b337b471757607c8a..6122d166ca57e30041c9af5f1c52284b9c6b7792 100644 (file)
--- a/drivers/staging/lustre/lustre/lov/lov_obd.c
+++ b/drivers/staging/lustre/lustre/lov/lov_obd.c
@@ -779,9 +779,9 @@ int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 
        if (desc->ld_magic != LOV_DESC_MAGIC) {
                if (desc->ld_magic == __swab32(LOV_DESC_MAGIC)) {
-                           CDEBUG(D_OTHER, "%s: Swabbing lov desc %p\n",
-                                  obd->obd_name, desc);
-                           lustre_swab_lov_desc(desc);
+                       CDEBUG(D_OTHER, "%s: Swabbing lov desc %p\n",
+                              obd->obd_name, desc);
+                       lustre_swab_lov_desc(desc);
                } else {
                        CERROR("%s: Bad lov desc magic: %#x\n",
                               obd->obd_name, desc->ld_magic);
@@ -1051,7 +1051,7 @@ static int lov_create(const struct lu_env *env, struct obd_export *exp,
        /* Recreate a specific object id at the given OST index */
        if ((src_oa->o_valid & OBD_MD_FLFLAGS) &&
            (src_oa->o_flags & OBD_FL_RECREATE_OBJS)) {
-                rc = lov_recreate(exp, src_oa, ea, oti);
+               rc = lov_recreate(exp, src_oa, ea, oti);
        }
 
        obd_putref(exp->exp_obd);

diff --git a/drivers/staging/lustre/lustre/lov/lov_pool.c b/drivers/staging/lustre/lustre/lov/lov_pool.c
index 14e920b2f121896be492597bee6edf13c3148b65..210304f2cc70cad5e1f971686f8dd6d8bf9a542f 100644 (file)
--- a/drivers/staging/lustre/lustre/lov/lov_pool.c
+++ b/drivers/staging/lustre/lustre/lov/lov_pool.c
@@ -228,7 +228,7 @@ static void *pool_proc_start(struct seq_file *s, loff_t *pos)
 
                i = 0;
                do {
-                    ptr = pool_proc_next(s, &iter, &i);
+                       ptr = pool_proc_next(s, &iter, &i);
                } while ((i < *pos) && ptr);
                return ptr;
        }

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_io.c b/drivers/staging/lustre/lustre/obdclass/cl_io.c
index 8cc7aa17ca642f1e2e7fcc069578d05037334bdd..191ec43d7a9e1442030a8e445cddafd42c940540 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/cl_io.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_io.c
@@ -329,32 +329,31 @@ static void cl_io_locks_sort(struct cl_io *io)
 int cl_queue_match(const struct list_head *queue,
                   const struct cl_lock_descr *need)
 {
-       struct cl_io_lock_link *scan;
+       struct cl_io_lock_link *scan;
 
-       list_for_each_entry(scan, queue, cill_linkage) {
-              if (cl_lock_descr_match(&scan->cill_descr, need))
-                      return 1;
-       }
-       return 0;
+       list_for_each_entry(scan, queue, cill_linkage) {
+               if (cl_lock_descr_match(&scan->cill_descr, need))
+                       return 1;
+       }
+       return 0;
 }
 EXPORT_SYMBOL(cl_queue_match);
 
 static int cl_queue_merge(const struct list_head *queue,
                          const struct cl_lock_descr *need)
 {
-       struct cl_io_lock_link *scan;
-
-       list_for_each_entry(scan, queue, cill_linkage) {
-              if (cl_lock_descr_cmp(&scan->cill_descr, need))
-                      continue;
-              cl_lock_descr_merge(&scan->cill_descr, need);
-              CDEBUG(D_VFSTRACE, "lock: %d: [%lu, %lu]\n",
-                     scan->cill_descr.cld_mode, scan->cill_descr.cld_start,
-                     scan->cill_descr.cld_end);
-              return 1;
-       }
-       return 0;
+       struct cl_io_lock_link *scan;
 
+       list_for_each_entry(scan, queue, cill_linkage) {
+               if (cl_lock_descr_cmp(&scan->cill_descr, need))
+                       continue;
+               cl_lock_descr_merge(&scan->cill_descr, need);
+               CDEBUG(D_VFSTRACE, "lock: %d: [%lu, %lu]\n",
+                      scan->cill_descr.cld_mode, scan->cill_descr.cld_start,
+                      scan->cill_descr.cld_end);
+               return 1;
+       }
+       return 0;
 }
 
 static int cl_lockset_match(const struct cl_lockset *set,
@@ -916,14 +915,14 @@ int cl_io_submit_sync(const struct lu_env *env, struct cl_io *io,
                 * clean pages), count them as completed to avoid infinite
                 * wait.
                 */
-                cl_page_list_for_each(pg, &queue->c2_qin) {
+               cl_page_list_for_each(pg, &queue->c2_qin) {
                        pg->cp_sync_io = NULL;
                        cl_sync_io_note(anchor, 1);
-                }
+               }
 
-                /* wait for the IO to be finished. */
-                rc = cl_sync_io_wait(env, io, &queue->c2_qout,
-                                     anchor, timeout);
+               /* wait for the IO to be finished. */
+               rc = cl_sync_io_wait(env, io, &queue->c2_qout,
+                                    anchor, timeout);
        } else {
                LASSERT(list_empty(&queue->c2_qout.pl_pages));
                cl_page_list_for_each(pg, &queue->c2_qin)

diff --git a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
index 16b1c70fb9deaf2b28db25126ed2473b810fca26..28bb4e53adaa6092a98b1a5b42d2b779166190db 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
+++ b/drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
@@ -577,7 +577,7 @@ EXPORT_SYMBOL(lprocfs_stats_collect);
 #define flag2str(flag, first)                                          \
        do {                                                            \
                if (imp->imp_##flag)                                    \
-                    seq_printf(m, "%s" #flag, first ? "" : ", ");      \
+                       seq_printf(m, "%s" #flag, first ? "" : ", ");   \
        } while (0)
 static int obd_import_flags2str(struct obd_import *imp, struct seq_file *m)
 {

diff --git a/drivers/staging/lustre/lustre/obdclass/obd_config.c b/drivers/staging/lustre/lustre/obdclass/obd_config.c
index 885f26674fd9b960ff9de09c28c5027c5a8f4aab..2134b60df626c4cb4cfb8c4398882190ad60321b 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/obd_config.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_config.c
@@ -1038,7 +1038,7 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars,
                         * can pass it down the stack
                         */
                        if (strnchr(key, keylen, '.'))
-                           return -ENOSYS;
+                               return -ENOSYS;
                        CERROR("%s: unknown param %s\n",
                               (char *)lustre_cfg_string(lcfg, 0), key);
                        /* rc = -EINVAL;        continue parsing other params */

diff --git a/drivers/staging/lustre/lustre/osc/lproc_osc.c b/drivers/staging/lustre/lustre/osc/lproc_osc.c
index cb9edaf963c602835e76cce1f6da7c60831dc389..b5df5e6da608d24aec333713af106f7ec89b527f 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/lproc_osc.c
+++ b/drivers/staging/lustre/lustre/osc/lproc_osc.c
@@ -422,8 +422,8 @@ static ssize_t osc_checksum_type_seq_write(struct file *file,
                if (((1 << i) & obd->u.cli.cl_supp_cksum_types) == 0)
                        continue;
                if (!strcmp(kernbuf, cksum_name[i])) {
-                      obd->u.cli.cl_cksum_type = 1 << i;
-                      return count;
+                       obd->u.cli.cl_cksum_type = 1 << i;
+                       return count;
                }
        }
        return -EINVAL;

diff --git a/drivers/staging/lustre/lustre/osc/osc_request.c b/drivers/staging/lustre/lustre/osc/osc_request.c
index 6f0c4e0dffa727e9faf6343821655373ac218d6c..53668e28b5ae5d2dce8465fd9affad6d7f3c0a40 100644 (file)
--- a/drivers/staging/lustre/lustre/osc/osc_request.c
+++ b/drivers/staging/lustre/lustre/osc/osc_request.c
@@ -2435,7 +2435,7 @@ static int osc_statfs_interpret(const struct lu_env *env,
                 * aware of the problem and takes care
                 * of the clean up
                 */
-                return rc;
+               return rc;
 
        if ((rc == -ENOTCONN || rc == -EAGAIN) &&
            (aa->aa_oi->oi_flags & OBD_STATFS_NODELAY)) {