[PATCH 1/2] Documentation: filesystems: add new btrfs mount options

[PATCH 1/2] Documentation: filesystems: add new btrfs mount options

[David Sterba]

Two new options were added in 3.12: commit and rescan_uuid_tree

CC: linux-doc@vger.kernel.org
Signed-off-by: David Sterba <dsterba@suse.cz>
---
 Documentation/filesystems/btrfs.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt
index 9dae59407437..3744ec373db9 100644
--- a/Documentation/filesystems/btrfs.txt
+++ b/Documentation/filesystems/btrfs.txt
@@ -70,6 +70,12 @@ Unless otherwise specified, all options default to off.
 
 	See comments at the top of fs/btrfs/check-integrity.c for more info.
 
+  commit=<seconds>
+	Set the interval of periodic commit, 30 seconds by default. Higher
+	values defer data being synced to permanent storage with obvious
+	consequences when the system crashes. The upper bound is not forced,
+	but a warning is printed if it's more than 300 seconds (5 minutes).
+
   compress
   compress=<type>
   compress-force
@@ -154,7 +160,11 @@ Unless otherwise specified, all options default to off.
 	Currently this scans a list of several previous tree roots and tries to 
 	use the first readable.
 
- skip_balance
+  rescan_uuid_tree
+	Force check and rebuild procedure of the UUID tree. This should not be
+	normally be needed.
+
+  skip_balance
 	Skip automatic resume of interrupted balance operation after mount.
 	May be resumed with "btrfs balance resume."
 
-- 
1.8.4.2

Re: [PATCH 1/2] Documentation: filesystems: add new btrfs mount options

[Stefan Behrens]

On Wed, 20 Nov 2013 15:05:51 +0100, David Sterba wrote:
> Two new options were added in 3.12: commit and rescan_uuid_tree
> 
> CC: linux-doc@vger.kernel.org
> Signed-off-by: David Sterba <dsterba@suse.cz>
> ---
>  Documentation/filesystems/btrfs.txt | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt
> index 9dae59407437..3744ec373db9 100644
> --- a/Documentation/filesystems/btrfs.txt
> +++ b/Documentation/filesystems/btrfs.txt
[...]
> - skip_balance
> +  rescan_uuid_tree
> +	Force check and rebuild procedure of the UUID tree. This should not be
> +	normally be needed.

"be" "be" twice is too much?

[PATCH 1/2 v2] Documentation: filesystems: add new btrfs mount options

[David Sterba]

Two new options were added in 3.12: commit and rescan_uuid_tree

CC: linux-doc@vger.kernel.org
Signed-off-by: David Sterba <dsterba@suse.cz>
---
v2: fix typo pointed out by Stefan

 Documentation/filesystems/btrfs.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Documentation/filesystems/btrfs.txt b/Documentation/filesystems/btrfs.txt
index 9dae59407437..81aaf1c1bbdc 100644
--- a/Documentation/filesystems/btrfs.txt
+++ b/Documentation/filesystems/btrfs.txt
@@ -70,6 +70,12 @@ Unless otherwise specified, all options default to off.
 
 	See comments at the top of fs/btrfs/check-integrity.c for more info.
 
+  commit=<seconds>
+	Set the interval of periodic commit, 30 seconds by default. Higher
+	values defer data being synced to permanent storage with obvious
+	consequences when the system crashes. The upper bound is not forced,
+	but a warning is printed if it's more than 300 seconds (5 minutes).
+
   compress
   compress=<type>
   compress-force
@@ -154,7 +160,11 @@ Unless otherwise specified, all options default to off.
 	Currently this scans a list of several previous tree roots and tries to 
 	use the first readable.
 
- skip_balance
+  rescan_uuid_tree
+	Force check and rebuild procedure of the UUID tree. This should not be
+	normally needed.
+
+  skip_balance
 	Skip automatic resume of interrupted balance operation after mount.
 	May be resumed with "btrfs balance resume."
 
-- 
1.8.4.2

Re: [PATCH 1/2 v2] Documentation: filesystems: add new btrfs mount options

[Chris Mason]

Quoting David Sterba (2013-11-21 11:48:03)
> Two new options were added in 3.12: commit and rescan_uuid_tree
> 
> CC: linux-doc@vger.kernel.org
> Signed-off-by: David Sterba <dsterba@suse.cz>
> ---
> v2: fix typo pointed out by Stefan

You just caught me before the pull request.  V1 was already in
for-linus, so I rebased this one in.

-chris