White space fix only. Translators can ignore.

Sponsored by:	iXsystems
This commit is contained in:
Dru Lavigne 2014-04-29 17:51:24 +00:00
parent f7a7cade7e
commit b3708dff8b
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=44700

View file

@ -1619,10 +1619,10 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen>
</indexterm> </indexterm>
<para>Beginning with &os;&nbsp;7.0, support for journals on <para>Beginning with &os;&nbsp;7.0, support for journals on
<acronym>UFS</acronym> file systems is <acronym>UFS</acronym> file systems is available. The
available. The implementation is provided through the implementation is provided through the <acronym>GEOM</acronym>
<acronym>GEOM</acronym> subsystem and is configured using subsystem and is configured using <command>gjournal</command>.
<command>gjournal</command>. Unlike other file system journaling implementations, the Unlike other file system journaling implementations, the
<command>gjournal</command> method is block based and not <command>gjournal</command> method is block based and not
implemented as part of the file system. It is a implemented as part of the file system. It is a
<acronym>GEOM</acronym> extension.</para> <acronym>GEOM</acronym> extension.</para>
@ -1638,40 +1638,38 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen>
Updates, which tracks and enforces meta-data updates, and Updates, which tracks and enforces meta-data updates, and
snapshots, which create an image of the file system, a log is snapshots, which create an image of the file system, a log is
stored in disk space specifically for this task. For better stored in disk space specifically for this task. For better
performance, the journal may be stored on another performance, the journal may be stored on another disk. In this
disk. In this configuration, the journal provider or storage configuration, the journal provider or storage device should be
device should be listed after the device to enable journaling listed after the device to enable journaling on.</para>
on.</para>
<para>The <filename>GENERIC</filename> kernel provides support <para>The <filename>GENERIC</filename> kernel provides support for
for <command>gjournal</command>. To automatically load the <command>gjournal</command>. To automatically load the
<filename>geom_journal.ko</filename> kernel module at boot time, <filename>geom_journal.ko</filename> kernel module at boot time,
add the following line to add the following line to
<filename>/boot/loader.conf</filename>:</para> <filename>/boot/loader.conf</filename>:</para>
<programlisting>geom_journal_load="YES"</programlisting> <programlisting>geom_journal_load="YES"</programlisting>
<para>If a custom <para>If a custom kernel is used, ensure the following line is in
kernel is used, ensure the following line is in the kernel configuration the kernel configuration file:</para>
file:</para>
<programlisting>options GEOM_JOURNAL</programlisting> <programlisting>options GEOM_JOURNAL</programlisting>
<para>Once the module is loaded, a journal can be created on a new <para>Once the module is loaded, a journal can be created on a new
file system file system using the following steps. In this example,
using the following steps. In this example,
<filename>da4</filename> is a new <acronym>SCSI</acronym> <filename>da4</filename> is a new <acronym>SCSI</acronym>
disk:</para> disk:</para>
<screen>&prompt.root; <userinput>gjournal load</userinput> <screen>&prompt.root; <userinput>gjournal load</userinput>
&prompt.root; <userinput>gjournal label /dev/<replaceable>da4</replaceable></userinput></screen> &prompt.root; <userinput>gjournal label /dev/<replaceable>da4</replaceable></userinput></screen>
<para>This will load the module and create a <filename>/dev/da4.journal</filename> <para>This will load the module and create a
device node on <filename>/dev/da4.journal</filename> device node on
<filename>/dev/da4</filename>.</para> <filename>/dev/da4</filename>.</para>
<para>A <acronym>UFS</acronym> file system may now be created on the <para>A <acronym>UFS</acronym> file system may now be created on
journaled device, then mounted on an existing mount point:</para> the journaled device, then mounted on an existing mount
point:</para>
<screen>&prompt.root; <userinput>newfs -O 2 -J /dev/<replaceable>da4</replaceable>.journal</userinput> <screen>&prompt.root; <userinput>newfs -O 2 -J /dev/<replaceable>da4</replaceable>.journal</userinput>
&prompt.root; <userinput>mount /dev/<replaceable>da4</replaceable>.journal <replaceable>/mnt</replaceable></userinput></screen> &prompt.root; <userinput>mount /dev/<replaceable>da4</replaceable>.journal <replaceable>/mnt</replaceable></userinput></screen>
@ -1679,9 +1677,8 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen>
<note> <note>
<para>In the case of several slices, a journal will be created <para>In the case of several slices, a journal will be created
for each individual slice. For instance, if for each individual slice. For instance, if
<filename>ad4s1</filename> and <filename>ad4s1</filename> and <filename>ad4s2</filename> are
<filename>ad4s2</filename> are both slices, then both slices, then <command>gjournal</command> will create
<command>gjournal</command> will create
<filename>ad4s1.journal</filename> and <filename>ad4s1.journal</filename> and
<filename>ad4s2.journal</filename>.</para> <filename>ad4s2.journal</filename>.</para>
</note> </note>
@ -1689,15 +1686,15 @@ ufsid/486b6fc16926168e N/A ad4s1f</screen>
<para>Journaling may also be enabled on current file systems by <para>Journaling may also be enabled on current file systems by
using <command>tunefs</command>. However, using <command>tunefs</command>. However,
<emphasis>always</emphasis> make a backup before attempting to <emphasis>always</emphasis> make a backup before attempting to
alter an existing file system. In most cases, <command>gjournal</command> alter an existing file system. In most cases,
will fail if it is unable to create the journal, but this does <command>gjournal</command> will fail if it is unable to create
not protect against data loss incurred as a result of misusing the journal, but this does not protect against data loss
<command>tunefs</command>. Refer to &man.gjournal.8; and incurred as a result of misusing <command>tunefs</command>.
&man.tunefs.8; for more information about these Refer to &man.gjournal.8; and &man.tunefs.8; for more
commands.</para> information about these commands.</para>
<para>It is possible to journal the boot disk of a &os; <para>It is possible to journal the boot disk of a &os; system.
system. Refer to the article <link Refer to the article <link
xlink:href="&url.articles.gjournal-desktop;">Implementing UFS xlink:href="&url.articles.gjournal-desktop;">Implementing UFS
Journaling on a Desktop PC</link> for detailed Journaling on a Desktop PC</link> for detailed
instructions.</para> instructions.</para>