qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ext4: split ext4_shutdown 

JIRA: https://issues.redhat.com/browse/RHEL-1516

commit 97524b454bc562f4052751f0e635a61dad78f1b2
Author: Christoph Hellwig <hch@lst.de>
Date:   Thu Jun 1 11:44:57 2023 +0200

    ext4: split ext4_shutdown

    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>
    Reviewed-by: Jan Kara <jack@suse.cz>
    Acked-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Dave Chinner <dchinner@redhat.com>
    Link: https://lore.kernel.org/r/20230601094459.1350643-15-hch@lst.de
    Signed-off-by: Jens Axboe <axboe@kernel.dk>

Signed-off-by: Ming Lei <ming.lei@redhat.com>
This commit is contained in:
Ming Lei 2023-06-01 11:44:57 +02:00
parent c3dbc9f426
commit 1633e7ded8
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/ext4/ext4.h
View File

@ -3028,6 +3028,7 @@ int ext4_fileattr_set(struct user_namespace *mnt_userns,
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 *);

24
fs/ext4/ioctl.c
View File

@ -792,16 +792,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;
@ -837,6 +830,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;
@ -1562,7 +1568,7 @@ resizefs_out:
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))