Merge branch 'maint' into next

9 files changed, 40 insertions, 39 deletions

diff --git a/debian/rules b/debian/rules
index d75ce766..334811bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -409,15 +409,15 @@ binary-arch: install $(INSTALL_UDEB)
 	mkdir -p ${debdir}/libcom-err${COMERR_SOVERSION}/usr/share/doc/libcom-err${COMERR_SOVERSION}
 	mkdir -p ${debdir}/comerr-dev/usr/share/doc
 
-	mkdir -p ${debdir}/libext2fs2/usr/share/doc/libext2fs
+	mkdir -p ${debdir}/libext2fs2/usr/share/doc/libext2fs2
 	mkdir -p ${debdir}/libext2fs-dev/usr/share/doc
 
 	dh_installdocs -a -Ne2fsprogs-udeb
 
   # HTML docs
-	$(INSTALL) -d ${debdir}/libext2fs-dev/usr/share/doc/libext2fs/html-info/
+	$(INSTALL) -d ${debdir}/libext2fs-dev/usr/share/doc/libext2fs2/html-info/
 	$(INSTALL) -p -m 0644 ${stdbuilddir}/doc/*.html \
-	   ${debdir}/libext2fs-dev/usr/share/doc/libext2fs/html-info/
+	   ${debdir}/libext2fs-dev/usr/share/doc/libext2fs2/html-info/
 	$(INSTALL) -d ${debdir}/comerr-dev/usr/share/doc/comerr-dev/html-info/
 	$(INSTALL) -p -m 0644 ${stdbuilddir}/lib/et/*.html \
 	   ${debdir}/comerr-dev/usr/share/doc/comerr-dev/html-info/
@@ -425,7 +425,7 @@ binary-arch: install $(INSTALL_UDEB)
   # texinfo docs
 	mkdir -p ${debdir}/comerr-dev/usr/share/doc/comerr-dev
 	$(INSTALL) -p -m 0644 ${topdir}/doc/libext2fs.texinfo \
-	   ${debdir}/libext2fs-dev/usr/share/doc/libext2fs/libext2fs.texi
+	   ${debdir}/libext2fs-dev/usr/share/doc/libext2fs2/libext2fs.texi
 	$(INSTALL) -p -m 0644 ${topdir}/lib/et/com_err.texinfo \
 	   ${debdir}/comerr-dev/usr/share/doc/comerr-dev/com_err.texi
 
diff --git a/lib/ext2fs/ext_attr.c b/lib/ext2fs/ext_attr.c
index 77a03620..78a823a9 100644
--- a/lib/ext2fs/ext_attr.c
+++ b/lib/ext2fs/ext_attr.c
@@ -1595,7 +1595,8 @@ errcode_t ext2fs_xattr_set(struct ext2_xattr_handle *h,
 			ret = EXT2_ET_FILESYSTEM_CORRUPTED;
 			goto out;
 		}
-		ret = xattr_array_update(h, name, value, value_len, ibody_free,
+		ret = xattr_array_update(h, name, new_value, value_len,
+					 ibody_free,
 					 0 /* block_free */, old_idx,
 					 0 /* in_inode */);
 		if (ret)
@@ -1614,12 +1615,12 @@ errcode_t ext2fs_xattr_set(struct ext2_xattr_handle *h,
 	    value_len > EXT4_XATTR_MIN_LARGE_EA_SIZE(fs->blocksize))
 		in_inode = 1;
 
-	ret = xattr_array_update(h, name, value, value_len, ibody_free,
+	ret = xattr_array_update(h, name, new_value, value_len, ibody_free,
 				 block_free, old_idx, in_inode);
 	if (ret == EXT2_ET_EA_NO_SPACE && !in_inode &&
 	    ext2fs_has_feature_ea_inode(fs->super))
-		ret = xattr_array_update(h, name, value, value_len, ibody_free,
-				 block_free, old_idx, 1 /* in_inode */);
+		ret = xattr_array_update(h, name, new_value, value_len,
+			ibody_free, block_free, old_idx, 1 /* in_inode */);
 	if (ret)
 		goto out;
 
diff --git a/misc/e2freefrag.8.in b/misc/e2freefrag.8.in
index 564be741..51faf436 100644
--- a/misc/e2freefrag.8.in
+++ b/misc/e2freefrag.8.in
@@ -23,7 +23,7 @@ The
 program will scan the block bitmap information to check how many free blocks
 are present as contiguous and aligned free space. The percentage of contiguous
 free blocks of size and of alignment
-.IR chunk_kb
+.I chunk_kb
 is reported.  It also displays the minimum/maximum/average free chunk size in
 the filesystem, along with a histogram of all free chunks.  This information
 can be used to gauge the level of free space fragmentation in the filesystem.
@@ -37,7 +37,7 @@ will print how many free chunks of size
 are available in units of kilobytes (Kb).  The chunk size must be a
 power of two and be larger than filesystem block size.
 .TP
-.BI \-h
+.B \-h
 Print the usage of the program.
 .SH EXAMPLE
 # e2freefrag /dev/vgroot/lvhome
diff --git a/misc/e2mmpstatus.8.in b/misc/e2mmpstatus.8.in
index f7d9557e..5f0e9dbb 100644
--- a/misc/e2mmpstatus.8.in
+++ b/misc/e2mmpstatus.8.in
@@ -34,11 +34,11 @@ the filesystem being modified simultaneously by more than one node.
 It is NOT safe to mount a filesystem when one of the following conditions
 is true:
 .br
-\	1. e2fsck is running on the filesystem.
+	1. e2fsck is running on the filesystem.
 .br
-\	2. the filesystem is in use by another node.
+	2. the filesystem is in use by another node.
 .br
-\	3. The MMP block is corrupted or cannot be read for some reason.
+	3. The MMP block is corrupted or cannot be read for some reason.
 .br
 The
 .B e2mmpstatus
diff --git a/misc/ext4.5.in b/misc/ext4.5.in
index d6559842..ee5e1709 100644
--- a/misc/ext4.5.in
+++ b/misc/ext4.5.in
@@ -191,7 +191,7 @@ the
 option to
 .BR mke2fs (8)
 or
-.BR tune2fs(8).
+.BR tune2fs(8) .
 .TP
 .B large_dir
 .br
@@ -766,13 +766,13 @@ ext4, 3.16
 ext4, 3.18
 .IP "\fBencrypt\fR" 2in
 ext4, 4.1
-.IP "\fBmetadata_csum_seed\fR" 2in
+.IP "\fBmetadata_csum_seed\fR" 2i
 ext4, 4.4
-.IP "\fBproject\fR" 2in
+.IP "\fBproject\fR" 2i
 ext4, 4.5
-.IP "\fBea_inode\fR" 2in
+.IP "\fBea_inode\fR" 2i
 ext4, 4.13
-.IP "\fBlarge_dir\fR" 2in
+.IP "\fBlarge_dir\fR" 2i
 ext4, 4.13
 .SH SEE ALSO
 .BR mke2fs (8),
diff --git a/misc/filefrag.8.in b/misc/filefrag.8.in
index 292b3b7d..5292672f 100644
--- a/misc/filefrag.8.in
+++ b/misc/filefrag.8.in
@@ -43,7 +43,7 @@ is unspecified it defaults to 1024 bytes.
 .B \-e
 Print output in extent format, even for block-mapped files.
 .TP
-.BI \-k
+.B \-k
 Use 1024\-byte blocksize for output (identical to '\-b 1024').
 .TP
 .B \-s
diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index 4a2aa8fd..7162494a 100644
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -363,7 +363,7 @@ small risk if the system crashes before the journal has been overwritten
 entirely one time.  If the option value is omitted, it defaults to 1 to
 enable lazy journal inode zeroing.
 .TP
-.BI no_copy_xattrs
+.B no_copy_xattrs
 Normally
 .B mke2fs
 will copy the extended attributes of the files in the directory
@@ -401,7 +401,7 @@ filesystem to change based on the user running \fBmke2fs\fR.
 Set a flag in the filesystem superblock indicating that it may be
 mounted using experimental kernel code, such as the ext4dev filesystem.
 .TP
-.BI discard
+.B discard
 Attempt to discard blocks at mkfs time (discarding blocks initially is useful
 on solid state devices and sparse / thin-provisioned storage). When the device
 advertises that discard also zeroes data (any subsequent read after the discard
@@ -409,10 +409,10 @@ and before write returns zero), then mark all not-yet-zeroed inode tables as
 zeroed. This significantly speeds up filesystem initialization. This is set
 as default.
 .TP
-.BI nodiscard
+.B nodiscard
 Do not attempt to discard blocks at mkfs time.
 .TP
-.BI quotatype
+.B quotatype
 Specify the which  quota types (usrquota, grpquota, prjquota) which
 should be enabled in the created file system.  The argument of this
 extended option should be a colon separated list.  This option has
@@ -699,7 +699,7 @@ touching the inode table and the block and inode bitmaps.  The
 program should be run immediately after this option is used, and there
 is no guarantee that any data will be salvageable.  Due to the wide
 variety of possible options to
-.BR mke2fs
+.B mke2fs
 that affect the on-disk layout, it is critical to specify exactly
 the same format options, such as blocksize, fs-type, feature flags, and
 other tunables when using this option, or the filesystem will be further
@@ -816,30 +816,30 @@ in the configuration file.
 WARNING: The undo file cannot be used to recover from a power or system crash.
 .SH ENVIRONMENT
 .TP
-.BI MKE2FS_SYNC
+.B MKE2FS_SYNC
 If set to non-zero integer value, its value is used to determine how often
 .BR sync (2)
 is called during inode table initialization.
 .TP
-.BI MKE2FS_CONFIG
+.B MKE2FS_CONFIG
 Determines the location of the configuration file (see
 .BR mke2fs.conf (5)).
 .TP
-.BI MKE2FS_FIRST_META_BG
+.B MKE2FS_FIRST_META_BG
 If set to non-zero integer value, its value is used to determine first meta
 block group. This is mostly for debugging purposes.
 .TP
-.BI MKE2FS_DEVICE_SECTSIZE
+.B MKE2FS_DEVICE_SECTSIZE
 If set to non-zero integer value, its value is used to determine logical
 sector size of the
 .IR device .
 .TP
-.BI MKE2FS_DEVICE_PHYS_SECTSIZE
+.B MKE2FS_DEVICE_PHYS_SECTSIZE
 If set to non-zero integer value, its value is used to determine physical
 sector size of the
 .IR device .
 .TP
-.BI MKE2FS_SKIP_CHECK_MSG
+.B MKE2FS_SKIP_CHECK_MSG
 If set, do not show the message of filesystem automatic check caused by
 mount count or check interval.
 .SH AUTHOR
diff --git a/misc/mke2fs.conf.5.in b/misc/mke2fs.conf.5.in
index ab93c776..cdebf08c 100644
--- a/misc/mke2fs.conf.5.in
+++ b/misc/mke2fs.conf.5.in
@@ -134,7 +134,7 @@ If both the user and the
 .B mke2fs.conf
 file do not specify a default filesystem type, mke2fs will use a
 default filesystem type of
-.IR ext3
+.I ext3
 if a journal was requested via a command-line option, or
 .I ext2
 if not.
@@ -512,7 +512,7 @@ huge file number.
 .I zero_hugefiles
 This boolean relation specifies whether or not zero blocks will be
 written to the hugefiles while
-.BR mke2fs(8)
+.BR mke2fs (8)
 is creating them.  By default, zero blocks will be written to the huge
 files to avoid stale data from being made available to potentially
 untrusted user programs, unless the device supports a discard/trim
diff --git a/misc/tune2fs.8.in b/misc/tune2fs.8.in
index f1def2bf..b60db6ed 100644
--- a/misc/tune2fs.8.in
+++ b/misc/tune2fs.8.in
@@ -94,7 +94,7 @@ tune2fs \- adjust tunable filesystem parameters on ext2/ext3/ext4 filesystems
 ]
 device
 .SH DESCRIPTION
-.BI tune2fs
+.B tune2fs
 allows the system administrator to adjust various tunable filesystem
 parameters on Linux ext2, ext3, or ext4 filesystems.  The current values
 of these options can be displayed by using the
@@ -331,7 +331,7 @@ must be run from a rescue floppy in order to effect this transition.
 On some distributions, such as Debian, if an initial ramdisk is used,
 the initrd scripts will automatically convert an ext2 root filesystem
 to ext3 if the
-.BR /etc/fstab
+.B /etc/fstab
 file specifies the ext3 filesystem for the root filesystem in order to
 avoid requiring the use of a rescue floppy to add an ext3 journal to
 the root filesystem.
@@ -653,9 +653,9 @@ feature,
 can be run to convert existing directories to the hashed B-tree format.
 Enabling certain filesystem features may prevent the filesystem from being
 mounted by kernels which do not support those features.  In particular, the
-.BR uninit_bg
+.B uninit_bg
 and
-.BR flex_bg
+.B flex_bg
 features are only supported by the ext4 filesystem.
 .TP
 .BI \-r " reserved-blocks-count"
@@ -666,13 +666,13 @@ Sets 'quota' feature on the superblock and works on the quota files for the
 given quota type. Quota options could be one or more of the following:
 .RS 1.2i
 .TP
-.BR [^]usrquota
+.B [^]usrquota
 Sets/clears user quota inode in the superblock.
 .TP
-.BR [^]grpquota
+.B [^]grpquota
 Sets/clears group quota inode in the superblock.
 .TP
-.BR [^]prjquota
+.B [^]prjquota
 Sets/clears project quota inode in the superblock.
 .RE
 .TP