Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[firefly-linux-kernel-4.4.55.git] / fs / reiserfs / bitmap.c

diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index 59f786dded49ce2a8c56dfe45ddab9f86f1d01b2..dc198bc64c61ddae9db7a936365a820d71abf2d0 100644 (file)
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -151,7 +151,6 @@ static int scan_bitmap_block(struct reiserfs_transaction_handle *th,
        int org = *beg;
 
        BUG_ON(!th->t_trans_id);
-
        RFALSE(bmap_n >= reiserfs_bmap_count(s), "Bitmap %u is out of "
               "range (0..%u)", bmap_n, reiserfs_bmap_count(s) - 1);
        PROC_INFO_INC(s, scan_bitmap.bmap);
@@ -356,7 +355,6 @@ static int scan_bitmap(struct reiserfs_transaction_handle *th,
        unsigned int off_max = s->s_blocksize << 3;
 
        BUG_ON(!th->t_trans_id);
-
        PROC_INFO_INC(s, scan_bitmap.call);
 
        /* No point in looking for more free blocks */
@@ -426,9 +424,7 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th,
        unsigned int nr, offset;
 
        BUG_ON(!th->t_trans_id);
-
        PROC_INFO_INC(s, free_block);
-
        rs = SB_DISK_SUPER_BLOCK(s);
        sbh = SB_BUFFER_WITH_SB(s);
        apbi = SB_AP_BITMAP(s);
@@ -473,8 +469,8 @@ void reiserfs_free_block(struct reiserfs_transaction_handle *th,
                         int for_unformatted)
 {
        struct super_block *s = th->t_super;
-       BUG_ON(!th->t_trans_id);
 
+       BUG_ON(!th->t_trans_id);
        RFALSE(!s, "vs-4061: trying to free block on nonexistent device");
        if (!is_reusable(s, block, 1))
                return;
@@ -509,6 +505,7 @@ static void __discard_prealloc(struct reiserfs_transaction_handle *th,
        unsigned long save = ei->i_prealloc_block;
        int dirty = 0;
        struct inode *inode = &ei->vfs_inode;
+
        BUG_ON(!th->t_trans_id);
 #ifdef CONFIG_REISERFS_CHECK
        if (ei->i_prealloc_count < 0)
@@ -532,6 +529,7 @@ void reiserfs_discard_prealloc(struct reiserfs_transaction_handle *th,
                               struct inode *inode)
 {
        struct reiserfs_inode_info *ei = REISERFS_I(inode);
+
        BUG_ON(!th->t_trans_id);
        if (ei->i_prealloc_count)
                __discard_prealloc(th, ei);
@@ -542,7 +540,6 @@ void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th)
        struct list_head *plist = &SB_JOURNAL(th->t_super)->j_prealloc_list;
 
        BUG_ON(!th->t_trans_id);
-
        while (!list_empty(plist)) {
                struct reiserfs_inode_info *ei;
                ei = list_entry(plist->next, struct reiserfs_inode_info,
@@ -601,7 +598,7 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options)
                if (!strcmp(this_char, "displacing_new_packing_localities")) {
                        SET_OPTION(displacing_new_packing_localities);
                        continue;
-               };
+               }
 
                if (!strcmp(this_char, "old_hashed_relocation")) {
                        SET_OPTION(old_hashed_relocation);
@@ -768,6 +765,7 @@ void show_alloc_options(struct seq_file *seq, struct super_block *s)
 static inline void new_hashed_relocation(reiserfs_blocknr_hint_t * hint)
 {
        char *hash_in;
+
        if (hint->formatted_node) {
                hash_in = (char *)&hint->key.k_dir_id;
        } else {
@@ -796,6 +794,7 @@ static void dirid_groups(reiserfs_blocknr_hint_t * hint)
        __u32 dirid = 0;
        int bm = 0;
        struct super_block *sb = hint->th->t_super;
+
        if (hint->inode)
                dirid = le32_to_cpu(INODE_PKEY(hint->inode)->k_dir_id);
        else if (hint->formatted_node)