Branch HEAD

b=13377
i=yury
i=nikita

indentation part of the 2+4(attachment 12552) and fid_unpack(attachment 12458) patches

diff --git a/lustre/include/lu_object.h b/lustre/include/lu_object.h
index e07dfbb..43947a6 100644 (file)
--- a/lustre/include/lu_object.h
+++ b/lustre/include/lu_object.h
@@ -980,21 +980,21 @@ struct lu_context_key {
                                                                   \
                 return value;                                     \
         }                                                         \
                                                                   \
                 return value;                                     \
         }                                                         \

-       struct __##mod##__dummy_init {;} /* semicolon catcher */
+        struct __##mod##__dummy_init {;} /* semicolon catcher */

 
 #define LU_KEY_FINI(mod, type)                                              \
         static void mod##_key_fini(const struct lu_context *ctx,            \
                                     struct lu_context_key *key, void* data) \
         {                                                                   \
 
 #define LU_KEY_FINI(mod, type)                                              \
         static void mod##_key_fini(const struct lu_context *ctx,            \
                                     struct lu_context_key *key, void* data) \
         {                                                                   \

-               type *info = data;                                          \
+                type *info = data;                                          \

                                                                             \
                                                                             \

-               OBD_FREE_PTR(info);                                         \
-       }                                                                   \
-       struct __##mod##__dummy_fini {;} /* semicolon catcher */
+                OBD_FREE_PTR(info);                                         \
+        }                                                                   \
+        struct __##mod##__dummy_fini {;} /* semicolon catcher */

 
 #define LU_KEY_INIT_FINI(mod, type)   \
 
 #define LU_KEY_INIT_FINI(mod, type)   \

-       LU_KEY_INIT(mod,type);        \
-       LU_KEY_FINI(mod,type);
+        LU_KEY_INIT(mod,type);        \
+        LU_KEY_FINI(mod,type)

 
 
 #define LU_CONTEXT_KEY_INIT(key)                        \
 
 
 #define LU_CONTEXT_KEY_INIT(key)                        \

diff --git a/lustre/include/lustre_mds.h b/lustre/include/lustre_mds.h
index e388fb8..f2ecea8 100644 (file)
--- a/lustre/include/lustre_mds.h
+++ b/lustre/include/lustre_mds.h
@@ -117,8 +117,8 @@ void mds_objids_from_lmm(obd_id *, struct lov_mds_md *, struct lov_desc *);
 
 static inline int md_should_create(__u32 flags)
 {
 
 static inline int md_should_create(__u32 flags)
 {

-       return !(flags & MDS_OPEN_DELAY_CREATE ||
-               !(flags & FMODE_WRITE));
+       return !(flags & MDS_OPEN_DELAY_CREATE ||
+               !(flags & FMODE_WRITE));

 }
 
 #endif
 }
 
 #endif