From: Tomohiro Kusumi Date: Tue, 7 Jul 2015 10:56:34 +0000 (+0900) Subject: hammer: Remove trailing tabs X-Git-Tag: v4.3.1~230 X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/66611793475d4b23a7aeb1f6153ddb8df67d0606 hammer: Remove trailing tabs - (Non-functional commits could make it difficult to git-blame the history if there are too many of those) --- diff --git a/sbin/mount_hammer/mount_hammer.c b/sbin/mount_hammer/mount_hammer.c index ba5328a3fd..70bb511b4d 100644 --- a/sbin/mount_hammer/mount_hammer.c +++ b/sbin/mount_hammer/mount_hammer.c @@ -244,7 +244,6 @@ extract_volumes(ary_ptr_t *aryp, int *countp, char **av, int ac) } --ac; ++av; - } *aryp = ary; *countp = idx; diff --git a/sbin/newfs_hammer/newfs_hammer.c b/sbin/newfs_hammer/newfs_hammer.c index 9e9e903c00..7c078a4271 100644 --- a/sbin/newfs_hammer/newfs_hammer.c +++ b/sbin/newfs_hammer/newfs_hammer.c @@ -427,7 +427,7 @@ trim_volume(struct volume_info *vol) { if (strncmp(vol->type, "DEVICE", sizeof("DEVICE")) == 0) { off_t ioarg[2]; - + /* 1MB offset to prevent destroying disk-reserved area */ ioarg[0] = vol->device_offset; ioarg[1] = vol->size; @@ -578,7 +578,6 @@ format_volume(struct volume_info *vol, int nvols, const char *label, format_freemap(vol, &ondisk->vol0_blockmap[HAMMER_ZONE_FREEMAP_INDEX]); - ondisk->vol0_stat_freebigblocks = initialize_freemap(vol); /* diff --git a/sys/vfs/hammer/hammer_btree.c b/sys/vfs/hammer/hammer_btree.c index 72378c95a0..e58b2a01ed 100644 --- a/sys/vfs/hammer/hammer_btree.c +++ b/sys/vfs/hammer/hammer_btree.c @@ -88,7 +88,7 @@ static int btree_split_leaf(hammer_cursor_t cursor); static int btree_remove(hammer_cursor_t cursor, int *ndelete); static __inline int btree_node_is_full(hammer_node_ondisk_t node); static __inline int btree_max_elements(u_int8_t type); -static int hammer_btree_mirror_propagate(hammer_cursor_t cursor, +static int hammer_btree_mirror_propagate(hammer_cursor_t cursor, hammer_tid_t mirror_tid); static void hammer_make_separator(hammer_base_elm_t key1, hammer_base_elm_t key2, hammer_base_elm_t dest); diff --git a/sys/vfs/hammer/hammer_inode.c b/sys/vfs/hammer/hammer_inode.c index c3a80847fd..c6940a1adc 100644 --- a/sys/vfs/hammer/hammer_inode.c +++ b/sys/vfs/hammer/hammer_inode.c @@ -1318,7 +1318,7 @@ retry: for (;;) { error = hammer_ip_sync_record_cursor(cursor, record); if (hammer_debug_inode) - kprintf("GENREC %p rec %08x %d\n", + kprintf("GENREC %p rec %08x %d\n", ip, record->flags, error); if (error != EDEADLK) break; diff --git a/sys/vfs/hammer/hammer_mirror.c b/sys/vfs/hammer/hammer_mirror.c index e0bff38f5d..3feca168d3 100644 --- a/sys/vfs/hammer/hammer_mirror.c +++ b/sys/vfs/hammer/hammer_mirror.c @@ -230,7 +230,6 @@ retry: error = copyout(&mrec, uptr, bytes); eatdisk = 1; goto didwrite; - } /* diff --git a/sys/vfs/hammer/hammer_prune.c b/sys/vfs/hammer/hammer_prune.c index 07c0fa82d8..548d1a1bf9 100644 --- a/sys/vfs/hammer/hammer_prune.c +++ b/sys/vfs/hammer/hammer_prune.c @@ -169,7 +169,7 @@ retry: (long long)elm->base.create_tid, (long long)elm->base.delete_tid); } - + if (prune_should_delete(prune, elm)) { if (hammer_debug_general & 0x0200) { kprintf("check %016llx %016llx: DELETE\n", diff --git a/sys/vfs/hammer/hammer_vfsops.c b/sys/vfs/hammer/hammer_vfsops.c index 3803c5e1b8..351f298efc 100644 --- a/sys/vfs/hammer/hammer_vfsops.c +++ b/sys/vfs/hammer/hammer_vfsops.c @@ -505,7 +505,7 @@ hammer_vfs_mount(struct mount *mp, char *mntpt, caddr_t data, TAILQ_INIT(&hmp->reclaim_list); RB_INIT(&hmp->rb_dedup_crc_root); - RB_INIT(&hmp->rb_dedup_off_root); + RB_INIT(&hmp->rb_dedup_off_root); TAILQ_INIT(&hmp->dedup_lru_list); } hmp->hflags &= ~HMNT_USERFLAGS; diff --git a/sys/vfs/hammer/hammer_vnops.c b/sys/vfs/hammer/hammer_vnops.c index 3e380b7c95..62a29e8847 100644 --- a/sys/vfs/hammer/hammer_vnops.c +++ b/sys/vfs/hammer/hammer_vnops.c @@ -1404,7 +1404,7 @@ hammer_vop_nlink(struct vop_nlink_args *ap) hammer_mount_t hmp; int error; - if (ap->a_dvp->v_mount != ap->a_vp->v_mount) + if (ap->a_dvp->v_mount != ap->a_vp->v_mount) return(EXDEV); nch = ap->a_nch; @@ -1966,7 +1966,7 @@ hammer_vop_nrename(struct vop_nrename_args *ap) u_int32_t max_iterations; int nlen, error; - if (ap->a_fdvp->v_mount != ap->a_tdvp->v_mount) + if (ap->a_fdvp->v_mount != ap->a_tdvp->v_mount) return(EXDEV); if (ap->a_fdvp->v_mount != ap->a_fnch->ncp->nc_vp->v_mount) return(EXDEV); @@ -3183,7 +3183,7 @@ hammer_vop_bmap(struct vop_bmap_args *ap) if (hammer_live_dedup) hammer_dedup_cache_add(ip, cursor.leaf); } - + error = hammer_ip_next(&cursor); }