Turn off immutable and append-only attribute in cleanup() only if they
are already turned on. Otherwise bogus WARNING would fail test case when
no xattr support in fs or mount without user_xattr option.
setxattr03 1 TCONF : No xattr support in fs or fs mounted without
user_xattr option
setxattr03 2 TCONF : Remaining cases not appropriate for configuration
setxattr03 0 TWARN : Unset setxattr03immutable immutable failed:
errno=EINVAL(22): Invalid argument
setxattr03 0 TWARN : Unset setxattr03appendonly append-only failed:
errno=EINVAL(22): Invalid argument
(The check-fd-value way is not perfect, but I think it's much more
easier and could cover the most common case.)
Signed-off-by: Eryu Guan <[email protected]>
---
testcases/kernel/syscalls/setxattr/setxattr03.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/testcases/kernel/syscalls/setxattr/setxattr03.c b/testcases/kernel/syscalls/setxattr/setxattr03.c
index fa97a6b..47a82b0 100644
--- a/testcases/kernel/syscalls/setxattr/setxattr03.c
+++ b/testcases/kernel/syscalls/setxattr/setxattr03.c
@@ -202,10 +202,10 @@ static void setup(void)
static void cleanup(void)
{
- if (set_immutable_off(immu_fd))
+ if ((immu_fd > 0) && set_immutable_off(immu_fd))
tst_resm(TWARN | TERRNO, "Unset %s immutable failed",
IMMU_FILE);
- if (set_append_off(append_fd))
+ if ((append_fd > 0) && set_append_off(append_fd))
tst_resm(TWARN | TERRNO, "Unset %s append-only failed",
APPEND_FILE);
close(immu_fd);
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
