common/casefold: only check for the Casefold flag
diff mbox series

Message ID 20190826175020.28959-1-tytso@mit.edu
State New
Headers show
Series
  • common/casefold: only check for the Casefold flag
Related show

Commit Message

Theodore Y. Ts'o Aug. 26, 2019, 5:50 p.m. UTC
The _casefold_lsattr_dir function lists all of the file attributes.
As result, tests/generic/556.out has an ext4-specific assumption that
files will have the Extents attribute.  That won't be true for all
file systems, and it won't even be true for ext4 file systems that do
not have the extents feature enabled.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
 common/casefold       |  6 +++++-
 tests/generic/556.out | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

Comments

Gabriel Krisman Bertazi Aug. 26, 2019, 8:06 p.m. UTC | #1
"Theodore Ts'o" <tytso@mit.edu> writes:

> The _casefold_lsattr_dir function lists all of the file attributes.
> As result, tests/generic/556.out has an ext4-specific assumption that
> files will have the Extents attribute.  That won't be true for all
> file systems, and it won't even be true for ext4 file systems that do
> not have the extents feature enabled.
>
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Theodore Y. Ts'o Aug. 26, 2019, 9:13 p.m. UTC | #2
On Mon, Aug 26, 2019 at 01:50:20PM -0400, Theodore Ts'o wrote:
> The _casefold_lsattr_dir function lists all of the file attributes.
> As result, tests/generic/556.out has an ext4-specific assumption that
> files will have the Extents attribute.  That won't be true for all

"files" above should probably be changed "the test directories".

Eryu, can you make that change before you apply the patch, or do you
want me to resend?

> file systems, and it won't even be true for ext4 file systems that do
> not have the extents feature enabled.
> 
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>

					- Ted
Eryu Guan Aug. 27, 2019, 2:12 a.m. UTC | #3
On Mon, Aug 26, 2019 at 05:13:01PM -0400, Theodore Y. Ts'o wrote:
> On Mon, Aug 26, 2019 at 01:50:20PM -0400, Theodore Ts'o wrote:
> > The _casefold_lsattr_dir function lists all of the file attributes.
> > As result, tests/generic/556.out has an ext4-specific assumption that
> > files will have the Extents attribute.  That won't be true for all
> 
> "files" above should probably be changed "the test directories".
> 
> Eryu, can you make that change before you apply the patch, or do you

Sure, I can fix it on commit.

> want me to resend?
> 
> > file systems, and it won't even be true for ext4 file systems that do
> > not have the extents feature enabled.
> > 
> > Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> 
> 					- Ted

Thanks!

Eryu

Patch
diff mbox series

diff --git a/common/casefold b/common/casefold
index 051fd1d1..2a7ab3eb 100644
--- a/common/casefold
+++ b/common/casefold
@@ -86,5 +86,9 @@  _casefold_unset_attr()
 
 _casefold_lsattr_dir()
 {
-	$LSATTR_PROG -ld "${1}" | _filter_spaces
+	if $LSATTR_PROG -ld "${1}" | grep -q Casefold ; then
+		echo "${1} Casefold"
+	else
+		echo "${1}"
+	fi
 }
diff --git a/tests/generic/556.out b/tests/generic/556.out
index 1573c8b1..47656065 100644
--- a/tests/generic/556.out
+++ b/tests/generic/556.out
@@ -1,9 +1,9 @@ 
 QA output created by 556
-SCRATCH_MNT/basic Extents, Casefold
-SCRATCH_MNT/basic Extents
-SCRATCH_MNT/casefold_flag_removal Extents, Casefold
-SCRATCH_MNT/casefold_flag_removal Extents, Casefold
-SCRATCH_MNT/flag_inheritance/d1/d2/d3 Extents, Casefold
+SCRATCH_MNT/basic Casefold
+SCRATCH_MNT/basic
+SCRATCH_MNT/casefold_flag_removal Casefold
+SCRATCH_MNT/casefold_flag_removal Casefold
+SCRATCH_MNT/flag_inheritance/d1/d2/d3 Casefold
 SCRATCH_MNT/symlink/ind1/TARGET
 mv: cannot stat 'SCRATCH_MNT/rename/rename': No such file or directory
 # file: SCRATCH_MNT/xattrs/x