From patchwork Fri Nov 20 14:56:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 7668801 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4F3B29F1C2 for ; Fri, 20 Nov 2015 15:01:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DBE5203B7 for ; Fri, 20 Nov 2015 15:01:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CF0C20383 for ; Fri, 20 Nov 2015 15:01:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162999AbbKTO41 (ORCPT ); Fri, 20 Nov 2015 09:56:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54540 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162997AbbKTO4V (ORCPT ); Fri, 20 Nov 2015 09:56:21 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 18B36130A; Fri, 20 Nov 2015 14:56:21 +0000 (UTC) Received: from warthog.procyon.org.uk ([10.3.112.6]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tAKEuEZm011021; Fri, 20 Nov 2015 09:56:15 -0500 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 09/12] fsinfo: Ext4: Return information through the filesystem info syscall From: David Howells To: arnd@arndb.de Cc: linux-afs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, dhowells@redhat.com, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org Date: Fri, 20 Nov 2015 14:56:13 +0000 Message-ID: <20151120145613.18930.78846.stgit@warthog.procyon.org.uk> In-Reply-To: <20151120145422.18930.72662.stgit@warthog.procyon.org.uk> References: <20151120145422.18930.72662.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Return Ext4 filesystem information through the filesystem info retrieval system call. This includes the following: (1) information about the capacity and resolution of the inode timestamps; (2) the volume label as the volume name, setting FSINFO_VOLUME_NAME; (3) the remote FSID as the volume ID, setting FSINFO_VOLUME_ID; (4) the statfs information; (5) a list of supported IOC flags. Example output: [root@andromeda ~]# ./test-fsinfo /var/cache/fscache/ fsinfo(/var/cache/fscache/) = 0 mask : 9f dev : 08:06 fs : type=ef53 name=ext4 ioc : 4bdfff nameln: 255 flags : 1020 times : range=ffffffff80000000-37fffffff atime : gran=1e-09s btime : gran=1e-09s ctime : gran=1e-09s mtime : gran=1e-09s blocks: n=1123529 fr=208887 av=146054 files : n=293760 fr=225334 av=225334 bsize : 4096 frsize: 4096 fsid : 48bc815f32464608 volume: 'fred' Signed-off-by: David Howells --- fs/ext4/super.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a63c7b0a10cf..fbd1cad4ff3b 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -73,6 +73,8 @@ static void ext4_clear_journal_err(struct super_block *sb, static int ext4_sync_fs(struct super_block *sb, int wait); static int ext4_remount(struct super_block *sb, int *flags, char *data); static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf); +static int ext4_get_fsinfo(struct dentry *dentry, struct fsinfo *f, + unsigned flags); static int ext4_unfreeze(struct super_block *sb); static int ext4_freeze(struct super_block *sb); static struct dentry *ext4_mount(struct file_system_type *fs_type, int flags, @@ -1122,6 +1124,7 @@ static const struct super_operations ext4_sops = { .freeze_fs = ext4_freeze, .unfreeze_fs = ext4_unfreeze, .statfs = ext4_statfs, + .get_fsinfo = ext4_get_fsinfo, .remount_fs = ext4_remount, .show_options = ext4_show_options, #ifdef CONFIG_QUOTA @@ -3524,6 +3527,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) if (sb->s_magic != EXT4_SUPER_MAGIC) goto cantfind_ext4; sbi->s_kbytes_written = le64_to_cpu(es->s_kbytes_written); + memcpy(sb->s_uuid, es->s_uuid, sizeof(sb->s_uuid)); /* Warn if metadata_csum and gdt_csum are both set. */ if (EXT4_HAS_RO_COMPAT_FEATURE(sb, @@ -5179,6 +5183,41 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf) return 0; } +/* + * Read filesystem information. + */ +static int ext4_get_fsinfo(struct dentry *dentry, struct fsinfo *f, + unsigned flags) +{ + struct super_block *sb = dentry->d_sb; + struct ext4_sb_info *sbi = EXT4_SB(sb); + struct ext4_super_block *es = sbi->s_es; + struct inode *inode = d_inode(dentry); + struct ext4_inode *raw_inode; + struct ext4_inode_info *ei = EXT4_I(inode); + + strcpy(f->f_volume_name, es->s_volume_name); + + f->f_mask = FSINFO_FSID | FSINFO_VOLUME_NAME; + f->f_supported_ioc_flags = EXT4_FL_USER_VISIBLE; + + f->f_min_time = S32_MIN; + f->f_max_time = S32_MAX; + + if (EXT4_FITS_IN_INODE(raw_inode, ei, i_ctime_extra)) + f->f_ctime_gran_exponent = -9; + if (EXT4_FITS_IN_INODE(raw_inode, ei, i_mtime_extra)) + f->f_mtime_gran_exponent = -9; + if (EXT4_FITS_IN_INODE(raw_inode, ei, i_atime_extra)) { + f->f_atime_gran_exponent = -9; + f->f_max_time += ((1 << EXT4_EPOCH_BITS) - 1) * 0x100000000LL; + } + if (EXT4_FITS_IN_INODE(raw_inode, ei, i_crtime_extra)) + f->f_btime_gran_exponent = -9; + + return vfs_get_fsinfo_from_statfs(dentry, f, flags); +} + /* Helper function for writing quotas on sync - we need to start transaction * before quota file is locked for write. Otherwise the are possible deadlocks: * Process 1 Process 2