From: Amir Goldstein <amir73il@gmail.com>
To: Jan Kara <jack@suse.cz>
Cc: Christian Brauner <brauner@kernel.org>, Chris Mason <clm@fb.com>,
Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>,
linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 2/3] btrfs: implement super operation to get fsid
Date: Wed, 25 Oct 2023 16:50:47 +0300 [thread overview]
Message-ID: <20231025135048.36153-3-amir73il@gmail.com> (raw)
In-Reply-To: <20231025135048.36153-1-amir73il@gmail.com>
btrfs statfs can report a different fsid for different inodes.
Implement btrfs_get_fsid() that can be used as a cheaper way of getting
the f_fsid memeber of kstatfs, for callers that only care about fsid.
fanotify is going to make use of that to get btrfs fsid from inode on
every event.
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
fs/btrfs/super.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 1a093ec0f7e3..fd08f7e81f72 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2016,6 +2016,26 @@ static inline int btrfs_calc_avail_data_space(struct btrfs_fs_info *fs_info,
return 0;
}
+static int btrfs_get_fsid(struct inode *inode, __kernel_fsid_t *fsid)
+{
+ struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+ __be32 *__fsid = (__be32 *)fs_info->fs_devices->fsid;
+
+ /*
+ * We treat it as constant endianness (it doesn't matter _which_)
+ * because we want the fsid to come out the same whether mounted
+ * on a big-endian or little-endian host
+ */
+ fsid->val[0] = be32_to_cpu(__fsid[0]) ^ be32_to_cpu(__fsid[2]);
+ fsid->val[1] = be32_to_cpu(__fsid[1]) ^ be32_to_cpu(__fsid[3]);
+
+ /* Mask in the root object ID too, to disambiguate subvols */
+ fsid->val[0] ^= BTRFS_I(inode)->root->root_key.objectid >> 32;
+ fsid->val[1] ^= BTRFS_I(inode)->root->root_key.objectid;
+
+ return 0;
+}
+
/*
* Calculate numbers for 'df', pessimistic in case of mixed raid profiles.
*
@@ -2038,7 +2058,6 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
u64 total_free_data = 0;
u64 total_free_meta = 0;
u32 bits = fs_info->sectorsize_bits;
- __be32 *fsid = (__be32 *)fs_info->fs_devices->fsid;
unsigned factor = 1;
struct btrfs_block_rsv *block_rsv = &fs_info->global_block_rsv;
int ret;
@@ -2124,16 +2143,7 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
buf->f_bsize = dentry->d_sb->s_blocksize;
buf->f_namelen = BTRFS_NAME_LEN;
- /* We treat it as constant endianness (it doesn't matter _which_)
- because we want the fsid to come out the same whether mounted
- on a big-endian or little-endian host */
- buf->f_fsid.val[0] = be32_to_cpu(fsid[0]) ^ be32_to_cpu(fsid[2]);
- buf->f_fsid.val[1] = be32_to_cpu(fsid[1]) ^ be32_to_cpu(fsid[3]);
- /* Mask in the root object ID too, to disambiguate subvols */
- buf->f_fsid.val[0] ^=
- BTRFS_I(d_inode(dentry))->root->root_key.objectid >> 32;
- buf->f_fsid.val[1] ^=
- BTRFS_I(d_inode(dentry))->root->root_key.objectid;
+ btrfs_get_fsid(d_inode(dentry), &buf->f_fsid);
return 0;
}
@@ -2362,6 +2372,7 @@ static const struct super_operations btrfs_super_ops = {
.alloc_inode = btrfs_alloc_inode,
.destroy_inode = btrfs_destroy_inode,
.free_inode = btrfs_free_inode,
+ .get_fsid = btrfs_get_fsid,
.statfs = btrfs_statfs,
.remount_fs = btrfs_remount,
.freeze_fs = btrfs_freeze,
--
2.34.1
next prev parent reply other threads:[~2023-10-25 13:51 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 13:50 [PATCH 0/3] fanotify support for btrfs sub-volumes Amir Goldstein
2023-10-25 13:50 ` [PATCH 1/3] fs: define a new super operation to get fsid Amir Goldstein
2023-10-25 13:50 ` Amir Goldstein [this message]
2023-10-25 13:50 ` [PATCH 3/3] fanotify: support reporting events with fid on btrfs sub-volumes Amir Goldstein
2023-10-25 15:34 ` [PATCH 0/3] fanotify support for " Christoph Hellwig
2023-10-25 17:04 ` Jan Kara
2023-10-27 5:44 ` Christoph Hellwig
2023-10-27 10:58 ` Jan Kara
2023-10-25 21:06 ` Josef Bacik
2023-10-25 23:02 ` Qu Wenruo
2023-10-26 5:49 ` Amir Goldstein
2023-10-27 5:46 ` Christoph Hellwig
2023-10-27 13:17 ` Josef Bacik
2023-10-27 13:47 ` Miklos Szeredi
2023-10-28 5:57 ` Amir Goldstein
2023-10-30 13:25 ` Christoph Hellwig
2023-10-31 12:14 ` Christian Brauner
2023-10-31 12:22 ` Christoph Hellwig
2023-10-31 12:50 ` Christian Brauner
2023-10-31 17:06 ` Christoph Hellwig
2023-11-01 0:03 ` Qu Wenruo
2023-11-03 14:21 ` Christoph Hellwig
2023-11-01 8:16 ` Christian Brauner
2023-11-01 8:41 ` Qu Wenruo
2023-11-01 9:52 ` Christian Brauner
2023-11-02 5:13 ` Josef Bacik
2023-11-02 8:53 ` Amir Goldstein
2023-11-02 9:48 ` Christian Brauner
2023-11-02 12:34 ` Josef Bacik
2023-11-02 17:07 ` David Sterba
2023-11-02 20:32 ` Josef Bacik
2023-11-03 6:56 ` Christian Brauner
2023-11-03 13:52 ` Josef Bacik
2023-11-02 11:07 ` Christian Brauner
2023-11-03 14:28 ` Christoph Hellwig
2023-11-03 15:47 ` Christian Brauner
2023-11-06 7:53 ` Christoph Hellwig
2023-11-06 8:18 ` Qu Wenruo
2023-11-06 9:56 ` Christian Brauner
2023-11-06 12:25 ` Christoph Hellwig
2023-11-06 10:03 ` Christian Brauner
2023-11-06 10:41 ` Qu Wenruo
2023-11-06 10:59 ` Christian Brauner
2023-11-06 12:30 ` Christoph Hellwig
2023-11-06 13:05 ` Christian Brauner
2023-11-06 17:10 ` Christoph Hellwig
2023-11-07 8:58 ` Christian Brauner
2023-11-08 7:56 ` Christoph Hellwig
2023-11-08 8:09 ` Christian Brauner
2023-11-08 8:12 ` Christoph Hellwig
2023-11-08 8:22 ` Christian Brauner
2023-11-08 14:07 ` Christoph Hellwig
2023-11-08 15:57 ` Christian Brauner
2023-11-06 12:29 ` Christoph Hellwig
2023-11-06 13:47 ` Christian Brauner
2023-11-06 17:13 ` Christoph Hellwig
2023-11-06 22:42 ` Josef Bacik
2023-11-07 9:06 ` Christian Brauner
2023-11-08 7:52 ` Christoph Hellwig
2023-11-08 8:27 ` Christian Brauner
2023-11-08 14:08 ` Christoph Hellwig
2023-11-08 16:16 ` Christian Brauner
2023-11-08 16:20 ` Christian Brauner
2023-11-09 6:55 ` Christoph Hellwig
2023-11-09 9:07 ` Christian Brauner
2023-11-09 14:41 ` Christoph Hellwig
2023-11-10 9:33 ` Christian Brauner
2023-11-10 10:31 ` Amir Goldstein
2023-11-09 6:53 ` Christoph Hellwig
2023-11-08 7:51 ` Christoph Hellwig
2023-11-08 11:08 ` Jan Kara
2023-11-08 14:11 ` Christoph Hellwig
2023-11-06 9:03 ` Jan Kara
2023-11-06 9:52 ` Christian Brauner
2023-11-06 12:22 ` Jan Kara
2023-11-03 14:23 ` Christoph Hellwig
2023-11-03 14:22 ` Christoph Hellwig
2023-10-25 17:17 ` Amir Goldstein
2023-10-25 18:02 ` Amir Goldstein
2023-10-26 12:17 ` Jan Kara
2023-10-26 12:36 ` Amir Goldstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231025135048.36153-3-amir73il@gmail.com \
--to=amir73il@gmail.com \
--cc=brauner@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=jack@suse.cz \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).