Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp1902127imm; Thu, 18 Oct 2018 06:12:29 -0700 (PDT) X-Google-Smtp-Source: ACcGV61jHb43eDZOxXQ8SYrB7yPgHEa72bWmvfOmgJV+dJk0xEowIo1f2tBxBVXD4jB2VCarnawr X-Received: by 2002:a17:902:7785:: with SMTP id o5-v6mr29171778pll.200.1539868349739; Thu, 18 Oct 2018 06:12:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539868349; cv=none; d=google.com; s=arc-20160816; b=r585CEFfHEYgBSHY262nvbijWP9WTqqsBZ1oDM42YNTXi0/+zndSCbpYIVMsAwXsvN I4fEo0YdeaXktyFkCAeAuxZBzqUU0PRGPC5WrSWMvUhi65OR/BjhGfmdR8/BR/nafsgq fCZz5/9fKXi4qCCVyYClHhNbe/IaziiNN+W2lkv3A/a/Icg+1U7NLaqEVISdaw2YFcrF dkM/m4OyIBsM0sVZ6Gvpb9e+z31aT241QuN6+E7gMc7/G/96bPETg28B6JS2aR6/6Bdh AziNXlH2Tk16LlY4RQ1m6D1IhxQHpCW4SnSEzzB6PNnQ1RAlP1ty/IrqGFOxJ8UNQeCx c2wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=OtkmpEPbA/uDUjnzZb7wK0E7hpxNB+LznWScKZ/Q3fg=; b=NEretQzFEtEirHehIkiK9RJNePMyNwsBaUZ1/mEA96pPVYkjZNuMJkHX9VUAvgErW5 UVWgux/hHAOwOHsOvNcyUe0cUlPH0oip0//V7P0VosxKdhjChmXYXgPHMlWe6UDXp+CC bb8AFYNWCIl+EZXkvSUayHz0BzrHNX2OU2ORcr+T1Lml+8khUi5/QchGALvDU6WF+T/E cMupHxwIbrB6D1qsbmIA4gZfpic1NILcZahzKFHivQbFY/KyEu8e3269O6v3eBKrDXDa UJW9ov+O/H/asyYPgn+oCUAxFqN4mtvvQo9Bkf0c+alZyszVtMV8Scvvg//GPgE4SA8K tzFg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k65-v6si21751480pfj.115.2018.10.18.06.12.13; Thu, 18 Oct 2018 06:12:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727757AbeJRVMe (ORCPT + 99 others); Thu, 18 Oct 2018 17:12:34 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:35562 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727550AbeJRVMe (ORCPT ); Thu, 18 Oct 2018 17:12:34 -0400 Received: by mail-wr1-f68.google.com with SMTP id w5-v6so33624735wrt.2 for ; Thu, 18 Oct 2018 06:11:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OtkmpEPbA/uDUjnzZb7wK0E7hpxNB+LznWScKZ/Q3fg=; b=CaTYJrj3TOSFl+iBUaqkiLNp37bAfpWz35e5ZbgU8JLSpIIdcElR1qLYLvsKNnYHih pO1f471Zni7KPJvttkQoCM7JYyEIkHSVD9EQGIQu40eKZ5cn0bzJ2QNRey3lDUO3caMX 9vgHE8bewQj1shxBr15CXBrYaToknZuPfChPitnilT4+t9Wh4rXppmfIT1Ausz7KMYb+ D5tklAwZS6+t3fhE1HOAdIlGO28o3DJi8ijGQqynjpMfjw4AAONnQUD9hFqaH9SSGbL1 0SCUSy18LUwb1pfcnThEGdBun9MkwIc8g3dmTb+E2VcoNRqJgWFe4ASXcCxa/7e7Icdt JlbA== X-Gm-Message-State: ABuFfogGOt3B8faEfX/2FjHt3PNzsnWDDr1LjJz1To9GpCJ1TlhGz5mu aRgDHYSLWCOx9cQ0pSdXLj8l4A== X-Received: by 2002:a5d:4292:: with SMTP id k18-v6mr27993795wrq.225.1539868293844; Thu, 18 Oct 2018 06:11:33 -0700 (PDT) Received: from veci.piliscsaba.redhat.com (catv-212-96-48-140.catv.broadband.hu. [212.96.48.140]) by smtp.gmail.com with ESMTPSA id u5-v6sm22246965wru.16.2018.10.18.06.11.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 06:11:33 -0700 (PDT) From: Miklos Szeredi To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-api@vger.kernel.org, David Howells , Michael Kerrisk , Andreas Dilger , Florian Weimer , Amir Goldstein Subject: [PATCH 3/3] statx: add STATX_ATTRIBUTES flag Date: Thu, 18 Oct 2018 15:11:25 +0200 Message-Id: <20181018131125.6303-3-mszeredi@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20181018131125.6303-1-mszeredi@redhat.com> References: <20181018131125.6303-1-mszeredi@redhat.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org FUSE will want to know if stx_attributes is interesting or not, because there's a non-zero cost of retreiving it. This is more of a "want" flag, since stx_attributes_mask already indicates whether we "got" stx_attributes or not. So for now we can just deal with this flag in the generic code. Signed-off-by: Miklos Szeredi Cc: David Howells Cc: Michael Kerrisk --- fs/stat.c | 3 +++ include/uapi/linux/stat.h | 1 + samples/statx/test-statx.c | 2 +- tools/include/uapi/linux/stat.h | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/stat.c b/fs/stat.c index 8d297a279991..6bf86d57e2e3 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -535,6 +535,9 @@ cp_statx(const struct kstat *stat, struct statx __user *buffer) tmp.stx_size = stat->size; tmp.stx_blocks = stat->blocks; tmp.stx_attributes_mask = stat->attributes_mask; + /* Having anything in attributes_mask means attributes are valid. */ + if (tmp.stx_attributes_mask) + tmp.stx_mask |= STATX_ATTRIBUTES; tmp.stx_atime.tv_sec = stat->atime.tv_sec; tmp.stx_atime.tv_nsec = stat->atime.tv_nsec; tmp.stx_btime.tv_sec = stat->btime.tv_sec; diff --git a/include/uapi/linux/stat.h b/include/uapi/linux/stat.h index 370f09d92fa6..aef0aba5dfe7 100644 --- a/include/uapi/linux/stat.h +++ b/include/uapi/linux/stat.h @@ -148,6 +148,7 @@ struct statx { #define STATX_BLOCKS 0x00000400U /* Want/got stx_blocks */ #define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */ #define STATX_BTIME 0x00000800U /* Want/got stx_btime */ +#define STATX_ATTRIBUTES 0x00001000U /* Want/got stx_attributes */ #define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */ diff --git a/samples/statx/test-statx.c b/samples/statx/test-statx.c index e354048dea3c..deef9a68ff68 100644 --- a/samples/statx/test-statx.c +++ b/samples/statx/test-statx.c @@ -211,7 +211,7 @@ int main(int argc, char **argv) struct statx stx; int ret, raw = 0, atflag = AT_SYMLINK_NOFOLLOW; - unsigned int mask = STATX_BASIC_STATS | STATX_BTIME; + unsigned int mask = STATX_BASIC_STATS | STATX_BTIME | STATX_ATTRIBUTES; for (argv++; *argv; argv++) { if (strcmp(*argv, "-F") == 0) { diff --git a/tools/include/uapi/linux/stat.h b/tools/include/uapi/linux/stat.h index 370f09d92fa6..aef0aba5dfe7 100644 --- a/tools/include/uapi/linux/stat.h +++ b/tools/include/uapi/linux/stat.h @@ -148,6 +148,7 @@ struct statx { #define STATX_BLOCKS 0x00000400U /* Want/got stx_blocks */ #define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */ #define STATX_BTIME 0x00000800U /* Want/got stx_btime */ +#define STATX_ATTRIBUTES 0x00001000U /* Want/got stx_attributes */ #define STATX__RESERVED 0x80000000U /* Reserved for future struct statx expansion */ -- 2.14.3