From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B86BE350D69 for ; Tue, 9 Sep 2025 15:24:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757431492; cv=none; b=jebn9vt+Zm5AUn/SIxfXQyDhacGxv1jvZaSVtLJzx8lBzK8xvz7/EuJiuJ7UxrTpOjM4W2MSswG2Vg8GfjUc96gXK719TrGSw2QZeKNpzXM4tDBt+vvqgvFRX/xTrMpOi8DSJt9rNfFy3fE+SPQNWFRS6KEQJT/rMguDCilAZU0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757431492; c=relaxed/simple; bh=DmqedATQlA3tvap4luNWBTZlVEta2u1+Btm7jB/VL10=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GxHTG+hyUhLDcaZjuIpWdtPDXbObpBEEm0TOfijNS/JGu/rn6npv6jJEUEjcT7xH6c+r5oWpeMyP+V9JLXwNaB3lwPrjtMgyNXMWfl2uANXTSQP7QGvvb0fVJEKYDlfctogw9KurORk9wiVl9RlfJe6N1sMxvtdt/hZAyCwgrP0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=DmuR5lKe; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DmuR5lKe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757431489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eBZ9scCH/zyWPoJz68zBrnbhhD6hwcL6Zqo/WIdWR24=; b=DmuR5lKetvC3ZPrAV8uFkpxP0Qkuo9bFP2QlhSRF5mHPiTKvOQumK1u5axl+GTfbePQNiR +WJ0nVsd4aEG/7w2w4mXc+E2oUZbyuJxPFtmtzGM4h8+7cGC8L30PIAFonPRey71r/yBLe fYkBhK1QzSVYmyskqzQVKC7a2KZ9UzM= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-279-9qeD7cuGMDWKFVIQruCHIA-1; Tue, 09 Sep 2025 11:24:48 -0400 X-MC-Unique: 9qeD7cuGMDWKFVIQruCHIA-1 X-Mimecast-MFC-AGG-ID: 9qeD7cuGMDWKFVIQruCHIA_1757431487 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-45df609b181so2166805e9.2 for ; Tue, 09 Sep 2025 08:24:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757431487; x=1758036287; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eBZ9scCH/zyWPoJz68zBrnbhhD6hwcL6Zqo/WIdWR24=; b=kFXu6S9cB86pfmQs6lfogc0BQt6cGsgItluGanZYXVyFycGqWKjXwub6iaqIrX7lnd 6k9BYTCFjTFRmhM0iwJDRdWAdZxGLq9VeK0hvnxQZVTaUEwHzQHJm5+nt983lLuCYpID kDY+dIaAkbk8ekPqJX+U30rBlSGvpMP/XhdBWC/eDWqf8D1qaVc5QCu0J81L2FiXUYz9 3OlXbzEPcmvetNh2CMd6p98NgKuRnIjENNy0f9Vx13GWgM/mjp7QpJ5ELA0V0I/hlAEO jjxCfZ0IYRniZZKFC8f9R7RUlY1HuuLaeikwGN8wSmIamNQT1xTi1P+mDS4V10kghkQw FJOg== X-Forwarded-Encrypted: i=1; AJvYcCUYfHL/xi1WcQRNwckF2w3YRI1LKLTk1pNkuJo91ddAldc5ndfAfsndqkE0bjsMq4g4syeq/YAM+JANmmSN@vger.kernel.org X-Gm-Message-State: AOJu0YyGVtz+6oE+2ZhZgX0l6865zJ2Inkm/B3urOfqtQZwxsw9gCui0 teQgq8bWP7Mc6rxFwibuYf9TdrgBrEb9cqx0vuBAR2ipAd/OuGZ/Xi4RVcXfuw2vbIcN0KqMS0p lKhSYglpTYuqEb+vvkTUurfvrs92av6+MYIYvDWCs/7uMlTNFtsxC8LeISxa9Y1TZ7Q== X-Gm-Gg: ASbGncugGMKuDyNpe5UPb5k6dH0lM7VBAg6dESaKUsZOcSlxG9RosXgcUhjn0KM5MUH KEBcg+WttiBrvpN6SXEkbLN6xu2X+NSnz+mbxAfVZN2/9FxVdCmsCa7jvK8ri8wt+EyR9D6+a41 C8wgUGz5xh8sNsUXaX3C6EffxPsw/b9wSSpMgnKTl+z9PWgEuIdLhJtkUncAgTZrwhWxdUxh9Hv 8lN28KHvoeyqeVHo6hy7hRH3112eAdHjcPbmoQCSEYoW4eEJlAZVG/ZT4uoVSfGoHwbW8xwZYjC V3a2TCBtn7KH10pl+Rme2EtZu2kTzK0OpCq0IuM= X-Received: by 2002:a05:6000:186b:b0:3e7:42c5:ea46 with SMTP id ffacd0b85a97d-3e742c5ecc3mr8754259f8f.55.1757431486832; Tue, 09 Sep 2025 08:24:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxbjkZ+LXkNckp/mA2ukswzHjE6s8xH7pjrkr+Tm+yixaxasA3i7Ue/iKRyo3do4u4RZPQ/A== X-Received: by 2002:a05:6000:186b:b0:3e7:42c5:ea46 with SMTP id ffacd0b85a97d-3e742c5ecc3mr8754241f8f.55.1757431486363; Tue, 09 Sep 2025 08:24:46 -0700 (PDT) Received: from [127.0.0.2] ([91.245.205.131]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45df17d9774sm11432015e9.9.2025.09.09.08.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Sep 2025 08:24:45 -0700 (PDT) From: Andrey Albershteyn X-Google-Original-From: Andrey Albershteyn Date: Tue, 09 Sep 2025 17:24:38 +0200 Subject: [PATCH v3 v3 3/4] xfs_io: make ls/chattr work with special files Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250909-xattrat-syscall-v3-3-4407a714817e@kernel.org> References: <20250909-xattrat-syscall-v3-0-4407a714817e@kernel.org> In-Reply-To: <20250909-xattrat-syscall-v3-0-4407a714817e@kernel.org> To: aalbersh@kernel.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org Cc: Andrey Albershteyn , "Darrick J. Wong" X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=6848; i=aalbersh@kernel.org; h=from:subject:message-id; bh=UAmqibEOjJrsPJ7LNU85TMCGqr7HuDx292L9Wqa7rtM=; b=owJ4nJvAy8zAJea2/JXEGuOHHIyn1ZIYMg647fq2U/mIXlPu//N+xovf8qlY8J5Y1LLrsf3On F5WqVknS7I6SlkYxLgYZMUUWdZJa01NKpLKP2JQIw8zh5UJZAgDF6cATETJn5HhmP3iDI9LkU/X rojUX7Uo1KTUJnC6+X0Gnu7jLx9c6uU1YGTYI21oo2W2Ze3jOVWF/HXvS9gVjy8rDzvx9s/ezwH MyuuYAUrrRs4= X-Developer-Key: i=aalbersh@kernel.org; a=openpgp; fpr=AE1B2A9562721A6FC4307C1F46A7EA18AC33E108 From: Andrey Albershteyn With new file_getattr/file_setattr syscalls we can now list/change file attributes on special files instead for ignoring them. Signed-off-by: Andrey Albershteyn Reviewed-by: "Darrick J. Wong" --- io/attr.c | 138 +++++++++++++++++++++++++++++++++++++------------------------- io/io.h | 2 +- io/stat.c | 2 +- 3 files changed, 84 insertions(+), 58 deletions(-) diff --git a/io/attr.c b/io/attr.c index fd82a2e73801..022ca5f1df1b 100644 --- a/io/attr.c +++ b/io/attr.c @@ -8,6 +8,7 @@ #include "input.h" #include "init.h" #include "io.h" +#include "libfrog/file_attr.h" static cmdinfo_t chattr_cmd; static cmdinfo_t lsattr_cmd; @@ -113,7 +114,7 @@ chattr_help(void) } void -printxattr( +print_xflags( uint flags, int verbose, int dofname, @@ -156,36 +157,36 @@ lsattr_callback( int status, struct FTW *data) { - struct fsxattr fsx; - int fd; + struct file_attr fa; + int error; if (recurse_dir && !S_ISDIR(stat->st_mode)) return 0; - if ((fd = open(path, O_RDONLY)) == -1) { - fprintf(stderr, _("%s: cannot open %s: %s\n"), - progname, path, strerror(errno)); - exitcode = 1; - } else if ((xfsctl(path, fd, FS_IOC_FSGETXATTR, &fsx)) < 0) { + error = xfrog_file_getattr(AT_FDCWD, path, stat, &fa, + AT_SYMLINK_NOFOLLOW); + if (error) { fprintf(stderr, _("%s: cannot get flags on %s: %s\n"), progname, path, strerror(errno)); exitcode = 1; - } else - printxattr(fsx.fsx_xflags, 0, 1, path, 0, 1); + return 0; + } + + print_xflags(fa.fa_xflags, 0, 1, path, 0, 1); - if (fd != -1) - close(fd); return 0; } static int lsattr_f( - int argc, - char **argv) + int argc, + char **argv) { - struct fsxattr fsx; - char *name = file->name; - int c, aflag = 0, vflag = 0; + struct file_attr fa; + char *name = file->name; + int c, aflag = 0, vflag = 0; + struct stat st; + int error; recurse_all = recurse_dir = 0; while ((c = getopt(argc, argv, "DRav")) != EOF) { @@ -211,17 +212,28 @@ lsattr_f( if (recurse_all || recurse_dir) { nftw(name, lsattr_callback, 100, FTW_PHYS | FTW_MOUNT | FTW_DEPTH); - } else if ((xfsctl(name, file->fd, FS_IOC_FSGETXATTR, &fsx)) < 0) { + return 0; + } + + error = stat(name, &st); + if (error) + return error; + + error = xfrog_file_getattr(AT_FDCWD, name, &st, &fa, + AT_SYMLINK_NOFOLLOW); + if (error) { fprintf(stderr, _("%s: cannot get flags on %s: %s\n"), progname, name, strerror(errno)); exitcode = 1; - } else { - printxattr(fsx.fsx_xflags, vflag, !aflag, name, vflag, !aflag); - if (aflag) { - fputs("/", stdout); - printxattr(-1, 0, 1, name, 0, 1); - } + return 0; } + + print_xflags(fa.fa_xflags, vflag, !aflag, name, vflag, !aflag); + if (aflag) { + fputs("/", stdout); + print_xflags(-1, 0, 1, name, 0, 1); + } + return 0; } @@ -232,44 +244,45 @@ chattr_callback( int status, struct FTW *data) { - struct fsxattr attr; - int fd; + struct file_attr attr; + int error; if (recurse_dir && !S_ISDIR(stat->st_mode)) return 0; - if ((fd = open(path, O_RDONLY)) == -1) { - fprintf(stderr, _("%s: cannot open %s: %s\n"), - progname, path, strerror(errno)); - exitcode = 1; - } else if (xfsctl(path, fd, FS_IOC_FSGETXATTR, &attr) < 0) { + error = xfrog_file_getattr(AT_FDCWD, path, stat, &attr, + AT_SYMLINK_NOFOLLOW); + if (error) { fprintf(stderr, _("%s: cannot get flags on %s: %s\n"), progname, path, strerror(errno)); exitcode = 1; - } else { - attr.fsx_xflags |= orflags; - attr.fsx_xflags &= ~andflags; - if (xfsctl(path, fd, FS_IOC_FSSETXATTR, &attr) < 0) { - fprintf(stderr, _("%s: cannot set flags on %s: %s\n"), - progname, path, strerror(errno)); - exitcode = 1; - } + return 0; + } + + attr.fa_xflags |= orflags; + attr.fa_xflags &= ~andflags; + error = xfrog_file_setattr(AT_FDCWD, path, stat, &attr, + AT_SYMLINK_NOFOLLOW); + if (error) { + fprintf(stderr, _("%s: cannot set flags on %s: %s\n"), + progname, path, strerror(errno)); + exitcode = 1; } - if (fd != -1) - close(fd); return 0; } static int chattr_f( - int argc, - char **argv) + int argc, + char **argv) { - struct fsxattr attr; - struct xflags *p; - unsigned int i = 0; - char *c, *name = file->name; + struct file_attr attr; + struct xflags *p; + unsigned int i = 0; + char *c, *name = file->name; + struct stat st; + int error; orflags = andflags = 0; recurse_all = recurse_dir = 0; @@ -326,19 +339,32 @@ chattr_f( if (recurse_all || recurse_dir) { nftw(name, chattr_callback, 100, FTW_PHYS | FTW_MOUNT | FTW_DEPTH); - } else if (xfsctl(name, file->fd, FS_IOC_FSGETXATTR, &attr) < 0) { + return 0; + } + + error = stat(name, &st); + if (error) + return error; + + error = xfrog_file_getattr(AT_FDCWD, name, &st, &attr, + AT_SYMLINK_NOFOLLOW); + if (error) { fprintf(stderr, _("%s: cannot get flags on %s: %s\n"), progname, name, strerror(errno)); exitcode = 1; - } else { - attr.fsx_xflags |= orflags; - attr.fsx_xflags &= ~andflags; - if (xfsctl(name, file->fd, FS_IOC_FSSETXATTR, &attr) < 0) { - fprintf(stderr, _("%s: cannot set flags on %s: %s\n"), - progname, name, strerror(errno)); - exitcode = 1; - } + return 0; } + + attr.fa_xflags |= orflags; + attr.fa_xflags &= ~andflags; + error = xfrog_file_setattr(AT_FDCWD, name, &st, &attr, + AT_SYMLINK_NOFOLLOW); + if (error) { + fprintf(stderr, _("%s: cannot set flags on %s: %s\n"), + progname, name, strerror(errno)); + exitcode = 1; + } + return 0; } diff --git a/io/io.h b/io/io.h index 259c034931b8..35fb8339eeb5 100644 --- a/io/io.h +++ b/io/io.h @@ -78,7 +78,7 @@ extern int openfile(char *, struct xfs_fsop_geom *, int, mode_t, extern int addfile(char *, int , struct xfs_fsop_geom *, int, struct fs_path *); extern int closefile(void); -extern void printxattr(uint, int, int, const char *, int, int); +extern void print_xflags(uint, int, int, const char *, int, int); extern unsigned int recurse_all; extern unsigned int recurse_dir; diff --git a/io/stat.c b/io/stat.c index c257037aa8ee..c1085f14eade 100644 --- a/io/stat.c +++ b/io/stat.c @@ -112,7 +112,7 @@ print_extended_info(int verbose) } printf(_("fsxattr.xflags = 0x%x "), fsx.fsx_xflags); - printxattr(fsx.fsx_xflags, verbose, 0, file->name, 1, 1); + print_xflags(fsx.fsx_xflags, verbose, 0, file->name, 1, 1); printf(_("fsxattr.projid = %u\n"), fsx.fsx_projid); printf(_("fsxattr.extsize = %u\n"), fsx.fsx_extsize); printf(_("fsxattr.cowextsize = %u\n"), fsx.fsx_cowextsize); -- 2.50.1