From c87d313d100b8cc21531ab7553982e1766ef4799 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Sun, 25 Jan 2015 00:55:21 +0900 Subject: [PATCH] hammer: some trivial fixes This patch fixes some trivial things. hunk1: Cleanup incomplete sentence hunk2: Sync comment with changes made in 4a2796f3 hunk3: Use right function name hunk4: Add missing comment hunk5: Add missing \n --- sbin/newfs_hammer/newfs_hammer.c | 3 +-- sys/vfs/hammer/hammer_blockmap.c | 2 +- sys/vfs/hammer/hammer_ondisk.c | 4 ++-- sys/vfs/hammer/hammer_volume.c | 5 ++--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sbin/newfs_hammer/newfs_hammer.c b/sbin/newfs_hammer/newfs_hammer.c index a1571dd..aa15602 100644 --- a/sbin/newfs_hammer/newfs_hammer.c +++ b/sbin/newfs_hammer/newfs_hammer.c @@ -533,8 +533,7 @@ format_volume(struct volume_info *vol, int nvols, const char *label, vol->vol_alloc += MemAreaSize; /* - * The remaining area is the zone 2 buffer allocation area. These - * buffers + * The remaining area is the zone 2 buffer allocation area. */ ondisk->vol_buf_beg = vol->vol_alloc; ondisk->vol_buf_end = vol->size & ~(int64_t)HAMMER_BUFMASK; diff --git a/sys/vfs/hammer/hammer_blockmap.c b/sys/vfs/hammer/hammer_blockmap.c index 7286360..878d79c 100644 --- a/sys/vfs/hammer/hammer_blockmap.c +++ b/sys/vfs/hammer/hammer_blockmap.c @@ -356,7 +356,7 @@ again: /* * If we are allocating from the base of a new buffer we can avoid - * a disk read by calling hammer_bnew(). + * a disk read by calling hammer_bnew_ext(). */ if ((next_offset & HAMMER_BUFMASK) == 0) { hammer_bnew_ext(trans->hmp, next_offset, bytes, diff --git a/sys/vfs/hammer/hammer_ondisk.c b/sys/vfs/hammer/hammer_ondisk.c index 876c5fe..a1be1d5 100644 --- a/sys/vfs/hammer/hammer_ondisk.c +++ b/sys/vfs/hammer/hammer_ondisk.c @@ -99,8 +99,8 @@ RB_GENERATE2(hammer_nod_rb_tree, hammer_node, rb_node, ************************************************************************ * * Load a HAMMER volume by name. Returns 0 on success or a positive error - * code on failure. Volumes must be loaded at mount time, get_volume() will - * not load a new volume. + * code on failure. Volumes must be loaded at mount time, hammer_get_volume() + * will not load a new volume. * * The passed devvp is vref()'d but not locked. This function consumes the * ref (typically by associating it with the volume structure). diff --git a/sys/vfs/hammer/hammer_volume.c b/sys/vfs/hammer/hammer_volume.c index dbd750b..5a87ae8 100644 --- a/sys/vfs/hammer/hammer_volume.c +++ b/sys/vfs/hammer/hammer_volume.c @@ -272,9 +272,8 @@ hammer_ioc_volume_del(hammer_transaction_t trans, hammer_inode_t ip, } /* - * + * Reblock filesystem */ - hmp->volume_to_remove = volume->vol_no; struct hammer_ioc_reblock reblock; @@ -861,7 +860,7 @@ hammer_format_volume_header(struct hammer_mount *hmp, struct vnode *devvp, ondisk->vol_buf_end = vol_size & ~(int64_t)HAMMER_BUFMASK; if (ondisk->vol_buf_end < ondisk->vol_buf_beg) { - kprintf("volume %d %s is too small to hold the volume header", + kprintf("volume %d %s is too small to hold the volume header\n", ondisk->vol_no, ondisk->vol_name); error = EFTYPE; goto late_failure; -- 2.1.2