summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkoverstreet <kent.overstreet@gmail.com>2024-08-23 17:47:05 -0400
committerGitHub <noreply@github.com>2024-08-23 17:47:05 -0400
commit6f938e0399ce04699682459408b090387c73adb3 (patch)
treece14743a94efc4d4b356b6ff932850ca3c58c317
parentd30bc111018c8522eefd154b0aade9a96b8103d9 (diff)
parent481a50f0a9f117320d7c1476abca12817c4a7c85 (diff)
Merge pull request #333 from reedriley/master
fix setattr in usage/docs; bump version in various places from v1.9.5 (wrong) to v1.11.1
-rw-r--r--Cargo.lock2
-rw-r--r--Cargo.toml2
-rw-r--r--Makefile4
-rw-r--r--c_src/cmd_attr.c4
-rw-r--r--doc/bcachefs.5.rst.tmpl9
5 files changed, 11 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 7938bbf3..8f911bf2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,7 +73,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bcachefs-tools"
-version = "1.9.5"
+version = "1.11.1"
dependencies = [
"anyhow",
"bch_bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index 0a65a3c0..dab3ef64 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "bcachefs-tools"
-version = "1.9.5"
+version = "1.11.1"
authors = ["Yuxuan Shui <yshuiv7@gmail.com>", "Kayla Firestack <dev@kaylafire.me>", "Kent Overstreet <kent.overstreet@linux.dev>" ]
edition = "2021"
rust-version = "1.70"
diff --git a/Makefile b/Makefile
index 6358fac2..6f4122da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.9.5
+VERSION=1.11.1
PREFIX?=/usr/local
LIBEXECDIR?=$(PREFIX)/libexec
@@ -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
diff --git a/c_src/cmd_attr.c b/c_src/cmd_attr.c
index bde9d8f6..1da41265 100644
--- a/c_src/cmd_attr.c
+++ b/c_src/cmd_attr.c
@@ -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:");
diff --git a/doc/bcachefs.5.rst.tmpl b/doc/bcachefs.5.rst.tmpl
index 8805af02..e896b861 100644
--- a/doc/bcachefs.5.rst.tmpl
+++ b/doc/bcachefs.5.rst.tmpl
@@ -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
-------
@@ -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
----------------------