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 1/3] fs: define a new super operation to get fsid
Date: Wed, 25 Oct 2023 16:50:46 +0300 [thread overview]
Message-ID: <20231025135048.36153-2-amir73il@gmail.com> (raw)
In-Reply-To: <20231025135048.36153-1-amir73il@gmail.com>
If implemented, get_fsid() 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.
Suggested-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230920110429.f4wkfuls73pd55pv@quack3/
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
Documentation/filesystems/locking.rst | 2 ++
Documentation/filesystems/vfs.rst | 4 ++++
fs/statfs.c | 14 ++++++++++++++
include/linux/fs.h | 1 +
include/linux/statfs.h | 2 ++
5 files changed, 23 insertions(+)
diff --git a/Documentation/filesystems/locking.rst b/Documentation/filesystems/locking.rst
index 7be2900806c8..a367950ee755 100644
--- a/Documentation/filesystems/locking.rst
+++ b/Documentation/filesystems/locking.rst
@@ -169,6 +169,7 @@ prototypes::
int (*freeze_fs) (struct super_block *);
int (*unfreeze_fs) (struct super_block *);
int (*statfs) (struct dentry *, struct kstatfs *);
+ int (*get_fsid) (struct inode *, __kernel_fsid_t *);
int (*remount_fs) (struct super_block *, int *, char *);
void (*umount_begin) (struct super_block *);
int (*show_options)(struct seq_file *, struct dentry *);
@@ -193,6 +194,7 @@ sync_fs: read
freeze_fs: write
unfreeze_fs: write
statfs: maybe(read) (see below)
+get_fsid: no
remount_fs: write
umount_begin: no
show_options: no (namespace_sem)
diff --git a/Documentation/filesystems/vfs.rst b/Documentation/filesystems/vfs.rst
index 99acc2e98673..f30f39f056ab 100644
--- a/Documentation/filesystems/vfs.rst
+++ b/Documentation/filesystems/vfs.rst
@@ -267,6 +267,7 @@ filesystem. The following members are defined:
enum freeze_wholder who);
int (*unfreeze_fs) (struct super_block *);
int (*statfs) (struct dentry *, struct kstatfs *);
+ int (*get_fsid) (struct inode *, __kernel_fsid_t *);
int (*remount_fs) (struct super_block *, int *, char *);
void (*umount_begin) (struct super_block *);
@@ -374,6 +375,9 @@ or bottom half).
``statfs``
called when the VFS needs to get filesystem statistics.
+``get_fsid``
+ called when the VFS needs to get only the f_fsid member of statfs.
+
``remount_fs``
called when the filesystem is remounted. This is called with
the kernel lock held
diff --git a/fs/statfs.c b/fs/statfs.c
index 96d1c3edf289..60a6af7356b7 100644
--- a/fs/statfs.c
+++ b/fs/statfs.c
@@ -69,11 +69,25 @@ static int statfs_by_dentry(struct dentry *dentry, struct kstatfs *buf)
return retval;
}
+int inode_get_fsid(struct inode *inode, __kernel_fsid_t *fsid)
+{
+ if (!inode->i_sb->s_op->get_fsid)
+ return -EOPNOTSUPP;
+
+ return inode->i_sb->s_op->get_fsid(inode, fsid);
+}
+EXPORT_SYMBOL(inode_get_fsid);
+
int vfs_get_fsid(struct dentry *dentry, __kernel_fsid_t *fsid)
{
struct kstatfs st;
int error;
+ /* Avoid statfs if fs supports cheaper get_fsid() */
+ error = inode_get_fsid(d_inode(dentry), fsid);
+ if (!error)
+ return 0;
+
error = statfs_by_dentry(dentry, &st);
if (error)
return error;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4a40823c3c67..30d7d3347c49 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2008,6 +2008,7 @@ struct super_operations {
int (*thaw_super) (struct super_block *, enum freeze_holder who);
int (*unfreeze_fs) (struct super_block *);
int (*statfs) (struct dentry *, struct kstatfs *);
+ int (*get_fsid)(struct inode *, __kernel_fsid_t *);
int (*remount_fs) (struct super_block *, int *, char *);
void (*umount_begin) (struct super_block *);
diff --git a/include/linux/statfs.h b/include/linux/statfs.h
index 02c862686ea3..c07f6d726e39 100644
--- a/include/linux/statfs.h
+++ b/include/linux/statfs.h
@@ -43,7 +43,9 @@ struct kstatfs {
#define ST_RELATIME 0x1000 /* update atime relative to mtime/ctime */
#define ST_NOSYMFOLLOW 0x2000 /* do not follow symlinks */
+struct inode;
struct dentry;
+extern int inode_get_fsid(struct inode *inode, __kernel_fsid_t *fsid);
extern int vfs_get_fsid(struct dentry *dentry, __kernel_fsid_t *fsid);
static inline __kernel_fsid_t u64_to_fsid(u64 v)
--
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 ` Amir Goldstein [this message]
2023-10-25 13:50 ` [PATCH 2/3] btrfs: implement super operation to get fsid Amir Goldstein
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-2-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).