From patchwork Thu Jan 10 03:14:59 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cui Yue <cuiyue-fnst@cn.fujitsu.com>
X-Patchwork-Id: 10755155
Return-Path: <fstests-owner@kernel.org>
Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
 [172.30.200.125])
	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A203E6C5
	for <patchwork-fstests@patchwork.kernel.org>;
 Thu, 10 Jan 2019 03:15:11 +0000 (UTC)
Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 910D329210
	for <patchwork-fstests@patchwork.kernel.org>;
 Thu, 10 Jan 2019 03:15:11 +0000 (UTC)
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
	id 82D502920D; Thu, 10 Jan 2019 03:15:11 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	pdx-wl-mail.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,HK_RANDOM_FROM,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF5802920D
	for <patchwork-fstests@patchwork.kernel.org>;
 Thu, 10 Jan 2019 03:15:10 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726950AbfAJDPK (ORCPT
        <rfc822;patchwork-fstests@patchwork.kernel.org>);
        Wed, 9 Jan 2019 22:15:10 -0500
Received: from mail.cn.fujitsu.com ([183.91.158.132]:20251 "EHLO
        heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
        with ESMTP id S1726637AbfAJDPK (ORCPT
        <rfc822;fstests@vger.kernel.org>); Wed, 9 Jan 2019 22:15:10 -0500
X-IronPort-AV: E=Sophos;i="5.56,459,1539619200";
   d="scan'208";a="51681405"
Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5])
  by heian.cn.fujitsu.com with ESMTP; 10 Jan 2019 11:15:07 +0800
Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80])
        by cn.fujitsu.com (Postfix) with ESMTP id 280EB4BAC833
        for <fstests@vger.kernel.org>; Thu, 10 Jan 2019 11:15:04 +0800 (CST)
Received: from cui-patch.g08.fujitsu.local (10.167.225.61) by
 G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server
 (TLS) id 14.3.408.0; Thu, 10 Jan 2019 11:15:11 +0800
From: Cui Yue <cuiyue-fnst@cn.fujitsu.com>
To: <fstests@vger.kernel.org>
CC: Cui Yue <cuiyue-fnst@cn.fujitsu.com>
Subject: [PATCH] generic/423: statx mask of the reference file is different
 from the original file
Date: Wed, 9 Jan 2019 22:14:59 -0500
Message-ID: <1547090099-8394-1-git-send-email-cuiyue-fnst@cn.fujitsu.com>
X-Mailer: git-send-email 1.8.3.1
MIME-Version: 1.0
X-Originating-IP: [10.167.225.61]
X-yoursite-MailScanner-ID: 280EB4BAC833.A2108
X-yoursite-MailScanner: Found to be clean
X-yoursite-MailScanner-From: cuiyue-fnst@cn.fujitsu.com
Sender: fstests-owner@vger.kernel.org
Precedence: bulk
List-ID: <fstests.vger.kernel.org>
X-Mailing-List: fstests@vger.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP

When running xfstests generic/423 to test system call statx() on hard link files of NFS, it fails.
error message:
[!] attr 'stx_mask' differs from ref file, 7ff != e0

The values of parameter "mask" between the original file and the reference file are different.
One is STATX_ALL;
The other is STATX_ATIME | STATX_BTIME | STATX_CTIME | STATX_MTIME.

Modify the function get_reference() to pass the "mask" in,
and change STATX_ATIME | STATX_BTIME | STATX_CTIME | STATX_MTIME to "mask".
Signed-off-by: Cui Yue <cuiyue-fnst@cn.fujitsu.com
---
 src/stat_test.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/stat_test.c b/src/stat_test.c
index 94c20d6..95cfdc4 100644
--- a/src/stat_test.c
+++ b/src/stat_test.c
@@ -290,7 +290,7 @@ static void set_origin_timestamp(const char *arg)
 /*
  * Get reference stats from a file.
  */
-static void get_reference(const char *file)
+static void get_reference(const char *file, unsigned int mask)
 {
 	int ret;
 
@@ -298,9 +298,7 @@ static void get_reference(const char *file)
 		bad_arg("ref= requires a filename\n");
 
 	memset(&ref, 0xfb, sizeof(ref));
-	ret = xfstests_statx(AT_FDCWD, file, AT_SYMLINK_NOFOLLOW,
-			     STATX_ATIME | STATX_BTIME | STATX_CTIME | STATX_MTIME,
-			     &ref);
+	ret = xfstests_statx(AT_FDCWD, file, AT_SYMLINK_NOFOLLOW, mask, &ref);
 	switch (ret) {
 	case 0:
 		ref_set = true;
@@ -751,7 +749,7 @@ int main(int argc, char **argv)
 
 		if (strncmp("ref=", arg, 4) == 0) {
 			/* ref=<file> - set reference stats from file */
-			get_reference(arg + 4);
+			get_reference(arg + 4, mask);
 			continue;
 		}