sbin/hammer: Cleanup header includes

sbin/hammer: Add uuid.c

Add a simple wrapper over uuid functions for better portability,
similar to sys/vfs/hammer/hammer_crc.h (which helped implement
version 7 CRC).

No functional changes.

sbin/*hammer: Use consistent static/inline/returntype format for functions

Change them to HAMMER2 style which has much more stable code style
than HAMMER1. HAMMER1 is basically a mix of every possib

sbin/*hammer: Use consistent static/inline/returntype format for functions

Change them to HAMMER2 style which has much more stable code style
than HAMMER1. HAMMER1 is basically a mix of every possible pattern
(even in the code originally written only by dillon@).

show more ...

sbin/hammer: Add /* not reached */

that were originally missing.
Recommended by dillon@.
No diff in sbin/hammer binary when assert(3) is disabled.

sbin/hammer: Make info command print a proper error message

Printing a function name of some library makes no sense.

sbin/hammer: Make info command properly handle non HAMMER path

This shouldn't be needed if i/f of libhammer were carefully designed,
but this seems to be the only guaranteed way to detect non HAMMER

sbin/hammer: Make info command properly handle non HAMMER path

This shouldn't be needed if i/f of libhammer were carefully designed,
but this seems to be the only guaranteed way to detect non HAMMER path,
and print a proper error message that makes sense for UFS, etc.

-- before this commit
# hammer info /boot
hammer: libhammer_get_fsinfo <--- ???

-- with this commit
# hammer info /boot
hammer: /boot is probably not a HAMMER filesystem: Inappropriate ioctl for device

show more ...

sbin/hammer: Don't hardcode 0 for root PFS

HAMMER code doesn't hardcode 0 for root PFS
(e.g. see sbin/newfs_hammer, it could be !=0 if one wants to do so).

Fix the existing error messages using har

sbin/hammer: Don't hardcode 0 for root PFS

HAMMER code doesn't hardcode 0 for root PFS
(e.g. see sbin/newfs_hammer, it could be !=0 if one wants to do so).

Fix the existing error messages using hardcoded 0.
Also add "(root PFS)" for PFS#0 in hammer info command.

show more ...

sbin/hammer: Change fprintf/exit to err variants [2/2]

Change
fprintf(stderr, ...); exit(1);
and
perror(...); exit(1);
to
err(1, ...) or errx(1, ...);
where possible for consistency.

This commit is

sbin/hammer: Change fprintf/exit to err variants [2/2]

Change
fprintf(stderr, ...); exit(1);
and
perror(...); exit(1);
to
err(1, ...) or errx(1, ...);
where possible for consistency.

This commit is just conversion to err(3) variants.
Messages themselves are not changed, except for removing
strerror(errno) for err(3), and removing trailing \n,
though err variants add program name in the messages.

err(3) and variants are non standard BSD functions, but HAMMER
userspace has been using BSD stuff aside from the existing
err/errx. Also note that err(3) is available in Linux as well.

show more ...

sbin/hammer: Don't print mountpoint of PFS

/sbin/hammer should not care if PFS are null mounted or where PFS are
mounted. It has nothing to do with the filesystem itself. PFS is just
a pointer to ju

sbin/hammer: Don't print mountpoint of PFS

/sbin/hammer should not care if PFS are null mounted or where PFS are
mounted. It has nothing to do with the filesystem itself. PFS is just
a pointer to jump into a subset of HAMMER's B-Tree (clustered by
localization parameter). Just because DragonFly's installer used to
use PFS (not anymore) and null mount by default doesn't mean /sbin
/hammer needs to provide null mount info.

If someone does mount PFS to somewhere and want to know where PFS are
mounted, one needs to just type mount. In fact this is much better
than getting mountpoints info via hammer info command because mount(8)
doesn't use hammer's ioctl which may cause B-Tree lookup, but instead
retrieves mountpoints directly from vfs.

Also note that printing such info gives users wrong assumption that
PFS in HAMMER is something equivalent of ZFS (created out of storage
zpool) which is not true. As mentioned above, PFS is just a pointer to
a subset of a single HAMMER filesystem. These are not independent fs.

Also note that hammer info still has bugs due to bugs from libhammer
and its attached ioctl as mentioned in e0f42079, including things under
investigation now. Whatever it is, hammer info needs to be rewritten
(as a different command like hammer fsinfo) in short and straight
forward code like other commands, without unnecessary abstraction.
I've been fixing and adding missing stuff to this hammer info command,
however hammer info is basically going nowhere because this command is
too tightly attached to libhammer.

show more ...

sbin/hammer: Don't include libhammer.h unconditionally

Though /sbin/hammer links to libhammer, only two commands use it.

Move SNAPSHOTS_BASE from cmd_cleanup.c to hammer.h.
This macro is defined in

sbin/hammer: Don't include libhammer.h unconditionally

Though /sbin/hammer links to libhammer, only two commands use it.

Move SNAPSHOTS_BASE from cmd_cleanup.c to hammer.h.
This macro is defined in both sbin/hammer and libhammer.
It apparently doesn't need to ask an external library for snapshot location.

# grep libhammer sbin/hammer sbin/newfs_hammer -rIl
sbin/hammer/cmd_info.c
sbin/hammer/cmd_snapshot.c
sbin/hammer/hammer.h

show more ...

sbin/hammer: Use printf() instead of fprintf(stdout)

Follow sbin/hammer's coding style (as well as C in general).

# grep "fprintf(stdout" sbin/hammer -riI
sbin/hammer/cmd_info.c:

sbin/hammer: Use printf() instead of fprintf(stdout)

Follow sbin/hammer's coding style (as well as C in general).

# grep "fprintf(stdout" sbin/hammer -riI
sbin/hammer/cmd_info.c: fprintf(stdout, "\n");
sbin/hammer/cmd_info.c: fprintf(stdout, "No mounted HAMMER filesystems found\n");
sbin/hammer/cmd_info.c: fprintf(stdout, "No mounted filesystems found\n");
sbin/hammer/cmd_info.c: fprintf(stdout, "Volume identification\n");
sbin/hammer/cmd_info.c: fprintf(stdout, "\tLabel %s\n", fip->vol_name);
sbin/hammer/cmd_info.c: fprintf(stdout, "\tNo. Volumes %d\n", fip->nvolumes);
sbin/hammer/cmd_info.c: fprintf(stdout, "\tHAMMER Volumes ");
sbin/hammer/cmd_info.c: fprintf(stdout, "\tRoot Volume %s\n", rootvol);
sbin/hammer/cmd_info.c: fprintf(stdout, "\tFSID %s\n", fsid);
sbin/hammer/cmd_info.c: fprintf(stdout, "\tHAMMER Version %d\n", fip->version);
sbin/hammer/cmd_info.c: fprintf(stdout, "Big-block information\n");
sbin/hammer/cmd_info.c: fprintf(stdout, "\tTotal %10jd\n", (intmax_t)fip->bigblocks);
sbin/hammer/cmd_info.c: fprintf(stdout, "\tUsed %10jd (%.2lf%%)\n"
sbin/hammer/cmd_info.c: fprintf(stdout, "Space information\n");
sbin/hammer/cmd_info.c: fprintf(stdout, "\tNo. Inodes %10jd\n", (intmax_t)fip->inodes);
sbin/hammer/cmd_info.c: fprintf(stdout, "\tTotal size %6s (%jd bytes)\n",
sbin/hammer/cmd_info.c: fprintf(stdout, "\tUsed %6s (%.2lf%%)\n", buf,
sbin/hammer/cmd_info.c: fprintf(stdout, "\tReserved %6s (%.2lf%%)\n", buf,
sbin/hammer/cmd_info.c: fprintf(stdout, "\tFree %6s (%.2lf%%)\n", buf,
sbin/hammer/cmd_info.c: fprintf(stdout, "PFS information\n");
sbin/hammer/cmd_info.c: fprintf(stdout, "\tPFS ID Mode Snaps Mounted on\n");
sbin/hammer/cmd_info.c: fprintf(stdout, "\t%6d %-6s",
sbin/hammer/cmd_info.c: fprintf(stdout, " %6s ", (pi->head.error && pi->snapcount == 0) ? "-" : buf);
sbin/hammer/cmd_info.c: fprintf(stdout, "%s", pi->mountedon);
sbin/hammer/cmd_info.c: fprintf(stdout, "not mounted");
sbin/hammer/cmd_info.c: fprintf(stdout, "\n");

show more ...

sbin/hammer: Add no hammer found message if not mounted

The local variable 'first' being non-zero after the loop means
none of them were hammer.

sbin/hammer: Make hammer info print volumes

in blkdevs format, in addition to 56c2f4d6.
This code is exactly what hammer volume-blkdevs does.

# hammer info /HAMMER
Volume identification

sbin/hammer: Make hammer info print volumes

in blkdevs format, in addition to 56c2f4d6.
This code is exactly what hammer volume-blkdevs does.

# hammer info /HAMMER
Volume identification
Label TEST
No. Volumes 3
HAMMER Volumes /dev/da1:/dev/da2:/dev/da3
Root Volume /dev/da1
...

show more ...

sbin/hammer: Make hammer commands print root volume path

Base on the change made by the previous commit, this commit adds
the root volume path information (not root volume#) to hammer info
and hamme

sbin/hammer: Make hammer commands print root volume path

Base on the change made by the previous commit, this commit adds
the root volume path information (not root volume#) to hammer info
and hammer volume-list commands. hammer volume-list shows the path
only on -v. This enables users to explicitly know the root volume.

[A] The existing /sbin/hammer
# hammer -v volume-list /HAMMER
/dev/da1
/dev/da2
/dev/da3
# hammer info /HAMMER | grep Root
Root Volume 0

[B] With this commit
# ./hammer -v volume-list /HAMMER
0 /dev/da1 (Root Volume)
1 /dev/da2
2 /dev/da3
# hammer info /HAMMER | grep Root
Root Volume /dev/da1

show more ...

sbin/hammer: Make hammer info print \n between filesystems

(not PFSs, but different HAMMER mounts)

sbin/hammer: Make hammer info print rootvol

The existence of "root volume" in HAMMER is mentioned in
error messages and dmesg as well as hammer(8) manpage,
but the problem is that no command really

sbin/hammer: Make hammer info print rootvol

The existence of "root volume" in HAMMER is mentioned in
error messages and dmesg as well as hammer(8) manpage,
but the problem is that no command really tells you which
one is the root volume. This is too obvious if you have
looked at the source, but no idea if otherwise.

Currently the only one explicitly tells you seems to be
a printf in newfs_hammer added by dae8f186 in 2015.

This commit adds hammer info a printf for root volume #,
which is still not clear enough since it's just a number,
but not a block device path.

show more ...

sys/vfs/hammer: Change "big block" to "big-block"

- This word refers to 8MB chunk in hammer's blockmap layers,
not literally "big" "block".

- Changes are mostly comments and some in printf and ha

sys/vfs/hammer: Change "big block" to "big-block"

- This word refers to 8MB chunk in hammer's blockmap layers,
not literally "big" "block".

- Changes are mostly comments and some in printf and hammer(8).

- The official design document as well as much of the existing
code (excluding variable and macro names) use "big-block".
https://www.dragonflybsd.org/hammer/hammer.pdf

- Also see e04ee2de.

show more ...

sbin/hammer: Remove duplicated header include

- <libhammer.h> is included by "hammer.h"

libhammer - Preparation for snapshot handling & fixes

Trivial changes:
- Function renaming to actually match what they are
describing.
- Clearer variable naming.

Additions:
- Structures to ho

libhammer - Preparation for snapshot handling & fixes

Trivial changes:
- Function renaming to actually match what they are
describing.
- Clearer variable naming.

Additions:
- Structures to hold snapshot data.
- Functions to retrieve snapshots from metadata for PFSes.
- A file for version compatibility functions.
- A function to return the canonical access path of a
PFS which is suitable for opening.
- Wrappers to operate per PFS snapshot list.

Changes & fixes:
- Use the new functions to gather all snaps of a PFS.
- Adapt hammer program for the changes.
- Check before free'ing in libhammer_free_fsinfo()
- Display the number of snapshots for unmounted PFSes.

Still missing:
- Manpages changes.

show more ...

hammer: fix terminology of "large block"

This cleanup patch changes terminology "large block" to "big block".

- Both "large block" and "big block" are widely used in hammer source from
kernel to us

hammer: fix terminology of "large block"

This cleanup patch changes terminology "large block" to "big block".

- Both "large block" and "big block" are widely used in hammer source from
kernel to userspace, however these two refer to the same data structure which
is a 8MB sized chunk within low level blockmapped storage layer.

- The original design document https://www.dragonflybsd.org/hammer/hammer.pdf
uses big block for this data structure. Having two expressions in its
implementation is confusing and makes grep difficult.

Closes: #2782

show more ...

hammer(8) - Allow specifying paths to 'info' directive.

gcc47 build fixes: Unused-but-set-variable + more warnings

The following programs fail to build with gcc47 due to the new
unused-but-set-variable warning. They've been fixed in various ways.
The on

gcc47 build fixes: Unused-but-set-variable + more warnings

The following programs fail to build with gcc47 due to the new
unused-but-set-variable warning. They've been fixed in various ways.
The ones set with WARNS=3 suppress cast-qual warning
There is a single enum-compare error too.

This effort is not complete.

bin/csh pass -Wno-unused-but-set-variable
bin/mined source file modified
bin/sh set WARNS=3
crypto/openssh source file modified (2)
gnu/lib/libdialog source file modified
gnu/usr.bin/gdb/kgdb source file modified
gnu/usr.bin/rcs source file modified
lib/libalias source file modified
lib/libdevstat source file modified
lib/libdm set WARNS=3
lib/libevtr source file modified
lib/libldns pass -Wno-unused-but-set-variable
lib/libncp source file modified
lib/libpam set WARNS=3
lib/libsmdb pass -Wno-unused-but-set-variable
lib/libstand source file modified (4)
lib/libtcplay source file modified
lib/libthread_xu source file modified (2)
libexec/rshd source file modified
libexec/telnetd source file modified
libexec/ypxfr pass -Wno-enum-compare
sbin/atm/fore_dnld source file modified
sbin/atm/ilmid source file modified
sbin/atm/camcontrol source file modifief (2)
sbin/ccdconfig source file modified
sbin/cryptdisks source file modified
sbin/ffsinfo source file modified
sbin/fsirand source file modified
sbin/growfs source file modified
sbin/hammer source file modified
sbin/ldconfig source file modified (real bug here?)
sbin/mount source file modified
sbin/mount_ufs source file modified
sbin/mount_extfs source file modified
sbin/mountd source file modified
sbin/natd source file modified
sbin/newfs source file modified
sbin/ping6 set WARNS=3, source modified
sbin/rcorder source file modified
sbin/reboot source file modified (real bug here?)
sbin/udevd source file modified
sbin/usched source file modified
sbin/vinum source file modified
sys/boot/common source file modified
sys/boot/pc32/loader source file modified
usr.bin/brandelf source file modified
usr.bin/bzip2 pass -Wno-unused-but-set-variable
usr.bin/dfregress source file modified
usr.bin/ee source file modified
usr.bin/less pass -Wno-unused-but-set-variable

show more ...

Initial import of binutils 2.22 on the new vendor branch

Future versions of binutils will also reside on this branch rather
than continuing to create new binutils branches for each new version.

hammer - Migration to libhammer (step 1/many)

- Start using libhammer
- Migrate info directive

hammer(8) - Fix snapshot count in info directive.

- We were wrongly using the HAMMER filesystem fd instead of a per-PFS one.
- Adapt the snapshot count in the case of error