linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
	Christian Brauner <brauner@kernel.org>,
	"Darrick J. Wong" <djwong@kernel.org>, Jan Kara <jack@suse.cz>,
	linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-xfs@vger.kernel.org
Subject: [PATCH 14/16] ext4: split ext4_shutdown
Date: Thu,  1 Jun 2023 11:44:57 +0200	[thread overview]
Message-ID: <20230601094459.1350643-15-hch@lst.de> (raw)
In-Reply-To: <20230601094459.1350643-1-hch@lst.de>

Split ext4_shutdown into a low-level helper that will be reused for
implementing the shutdown super operation and a wrapper for the ioctl
handling.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/ext4/ext4.h  |  1 +
 fs/ext4/ioctl.c | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 6948d673bba2e8..2d60bbe8d171d9 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2965,6 +2965,7 @@ int ext4_fileattr_set(struct mnt_idmap *idmap,
 int ext4_fileattr_get(struct dentry *dentry, struct fileattr *fa);
 extern void ext4_reset_inode_seed(struct inode *inode);
 int ext4_update_overhead(struct super_block *sb, bool force);
+int ext4_force_shutdown(struct super_block *sb, u32 flags);
 
 /* migrate.c */
 extern int ext4_ext_migrate(struct inode *);
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index f9a43015206323..961284cc9b65cc 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -793,16 +793,9 @@ static int ext4_ioctl_setproject(struct inode *inode, __u32 projid)
 }
 #endif
 
-static int ext4_shutdown(struct super_block *sb, unsigned long arg)
+int ext4_force_shutdown(struct super_block *sb, u32 flags)
 {
 	struct ext4_sb_info *sbi = EXT4_SB(sb);
-	__u32 flags;
-
-	if (!capable(CAP_SYS_ADMIN))
-		return -EPERM;
-
-	if (get_user(flags, (__u32 __user *)arg))
-		return -EFAULT;
 
 	if (flags > EXT4_GOING_FLAGS_NOLOGFLUSH)
 		return -EINVAL;
@@ -838,6 +831,19 @@ static int ext4_shutdown(struct super_block *sb, unsigned long arg)
 	return 0;
 }
 
+static int ext4_ioctl_shutdown(struct super_block *sb, unsigned long arg)
+{
+	u32 flags;
+
+	if (!capable(CAP_SYS_ADMIN))
+		return -EPERM;
+
+	if (get_user(flags, (__u32 __user *)arg))
+		return -EFAULT;
+
+	return ext4_force_shutdown(sb, flags);
+}
+
 struct getfsmap_info {
 	struct super_block	*gi_sb;
 	struct fsmap_head __user *gi_data;
@@ -1566,7 +1572,7 @@ static long __ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		return ext4_ioctl_get_es_cache(filp, arg);
 
 	case EXT4_IOC_SHUTDOWN:
-		return ext4_shutdown(sb, arg);
+		return ext4_ioctl_shutdown(sb, arg);
 
 	case FS_IOC_ENABLE_VERITY:
 		if (!ext4_has_feature_verity(sb))
-- 
2.39.2


  parent reply	other threads:[~2023-06-01  9:46 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-01  9:44 introduce bdev holder ops and a file system shutdown method v3 Christoph Hellwig
2023-06-01  9:44 ` [PATCH 01/16] block: factor out a bd_end_claim helper from blkdev_put Christoph Hellwig
2023-06-01  9:44 ` [PATCH 02/16] block: refactor bd_may_claim Christoph Hellwig
2023-06-01  9:44 ` [PATCH 03/16] block: turn bdev_lock into a mutex Christoph Hellwig
2023-06-01  9:44 ` [PATCH 04/16] block: consolidate the shutdown logic in blk_mark_disk_dead and del_gendisk Christoph Hellwig
2023-06-01  9:44 ` [PATCH 05/16] block: avoid repeated work in blk_mark_disk_dead Christoph Hellwig
2023-06-01  9:44 ` [PATCH 06/16] block: unhash the inode earlier in delete_partition Christoph Hellwig
2023-06-01  9:44 ` [PATCH 07/16] block: delete partitions later in del_gendisk Christoph Hellwig
2023-06-01  9:44 ` [PATCH 08/16] block: remove blk_drop_partitions Christoph Hellwig
2023-06-01  9:44 ` [PATCH 09/16] block: introduce holder ops Christoph Hellwig
2023-06-01  9:44 ` [PATCH 10/16] block: add a mark_dead holder operation Christoph Hellwig
2023-06-01  9:44 ` [PATCH 11/16] fs: add a method to shut down the file system Christoph Hellwig
2023-06-01  9:44 ` [PATCH 12/16] xfs: wire up sops->shutdown Christoph Hellwig
2023-06-01  9:44 ` [PATCH 13/16] xfs: wire up the ->mark_dead holder operation for log and RT devices Christoph Hellwig
2023-06-01  9:44 ` Christoph Hellwig [this message]
2023-06-01 10:10   ` [PATCH 14/16] ext4: split ext4_shutdown Jan Kara
2023-06-01  9:44 ` [PATCH 15/16] ext4: wire up sops->shutdown Christoph Hellwig
2023-06-01 10:10   ` Jan Kara
2023-06-01  9:44 ` [PATCH 16/16] ext4: wire up the ->mark_dead holder operation for log devices Christoph Hellwig
2023-06-01 10:11   ` Jan Kara
2023-06-01 21:48 ` introduce bdev holder ops and a file system shutdown method v3 Dave Chinner
2023-06-05 17:22 ` Jens Axboe

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=20230601094459.1350643-15-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=brauner@kernel.org \
    --cc=djwong@kernel.org \
    --cc=jack@suse.cz \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /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).