Skip to content

Commit

Permalink
Merge pull request #333 from reedriley/master
Browse files Browse the repository at this point in the history
fix setattr in usage/docs; bump version in various places from v1.9.5 (wrong) to v1.11.1
  • Loading branch information
koverstreet committed Aug 23, 2024
2 parents d30bc11 + 481a50f commit 6f938e0
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bcachefs-tools"
version = "1.9.5"
version = "1.11.1"
authors = ["Yuxuan Shui <[email protected]>", "Kayla Firestack <[email protected]>", "Kent Overstreet <[email protected]>" ]
edition = "2021"
rust-version = "1.70"
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=1.9.5
VERSION=1.11.1

PREFIX?=/usr/local
LIBEXECDIR?=$(PREFIX)/libexec
Expand Down Expand Up @@ -287,7 +287,7 @@ tarball: $(SRCTARXZ)

$(SRCTARXZ) : .gitcensus
$(Q)tar --transform "s,^,$(SRCDIR)/," -Jcf $(SRCDIR).tar.xz \
`cat .gitcensus`
`cat .gitcensus`
@echo Wrote: $@

.PHONY: .gitcensus
Expand Down
4 changes: 2 additions & 2 deletions c_src/cmd_attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ static void do_setattr(char *path, struct bch_opt_strs opts)

static void setattr_usage(void)
{
puts("bcachefs setattr - set attributes on files in a bcachefs filesystem\n"
"Usage: bcachefs setattr [OPTIONS]... <files>\n"
puts("bcachefs set-file-option - set attributes on files in a bcachefs filesystem\n"
"Usage: bcachefs set-file-option [OPTIONS]... <files>\n"
"\n"
"Options:");

Expand Down
9 changes: 5 additions & 4 deletions doc/bcachefs.5.rst.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ time, mount time (as mount -o parameters), or changed at runtime via sysfs (via
the /sys/fs/bcachefs/<UUID>/options/ directory).

Many of those options (particularly those that control the IO path) can also be
set on individual files and directories, via the bcachefs setattr command (which
internally mostly works via the extended attribute interface, but the setattr
command takes care to propagate options to children correctly).
set on individual files and directories, via the bcachefs set-file-option
command (which internally mostly works via the extended attribute interface, but
the set-file-option command takes care to propagate options to children
correctly).

OPTIONS
-------
Expand All @@ -48,7 +49,7 @@ at the same time.
We generally avoid per-device options, preferring instead options that can be
overridden on files or directories, but there are some:

*durability*
*durability*

Device labels, targets
----------------------
Expand Down

0 comments on commit 6f938e0

Please sign in to comment.