xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4: rename EXT4_IOC_GOINGDOWN to EXT4_IOC_SHUTDOWN

Browse Source 
It's very likely the file system independent ioctl name will be
FS_IOC_SHUTDOWN, so let's use the same name for the ext4 ioctl name.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o
2017-02-20 15:34:59 -05:00
parent 2ba3e6e8af
commit e9be2ac7c0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ext4/ext4.h
View File

@@ -679,7 +679,7 @@ struct fsxattr {
#define EXT4_IOC_FSGETXATTR FS_IOC_FSGETXATTR #define EXT4_IOC_FSGETXATTR FS_IOC_FSGETXATTR
#define EXT4_IOC_FSSETXATTR FS_IOC_FSSETXATTR #define EXT4_IOC_FSSETXATTR FS_IOC_FSSETXATTR
#define EXT4_IOC_GOINGDOWN _IOR ('X', 125, __u32) #define EXT4_IOC_SHUTDOWN _IOR ('X', 125, __u32)
/* /*
* Flags for going down operation * Flags for going down operation

8
fs/ext4/ioctl.c
View File

@@ -443,7 +443,7 @@ static inline unsigned long ext4_xflags_to_iflags(__u32 xflags)
return iflags; return iflags;
} }
int ext4_goingdown(struct super_block *sb, unsigned long arg) int ext4_shutdown(struct super_block *sb, unsigned long arg)
{ {
struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_sb_info *sbi = EXT4_SB(sb);
__u32 flags; __u32 flags;
@@ -940,8 +940,8 @@ resizefs_out:
return 0; return 0;
} }
case EXT4_IOC_GOINGDOWN: case EXT4_IOC_SHUTDOWN:
return ext4_goingdown(sb, arg); return ext4_shutdown(sb, arg);
default: default:
return -ENOTTY; return -ENOTTY;
} }
@@ -1008,7 +1008,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case EXT4_IOC_SET_ENCRYPTION_POLICY: case EXT4_IOC_SET_ENCRYPTION_POLICY:
case EXT4_IOC_GET_ENCRYPTION_PWSALT: case EXT4_IOC_GET_ENCRYPTION_PWSALT:
case EXT4_IOC_GET_ENCRYPTION_POLICY: case EXT4_IOC_GET_ENCRYPTION_POLICY:
case EXT4_IOC_GOINGDOWN: case EXT4_IOC_SHUTDOWN:
break; break;
default: default:
return -ENOIOCTLCMD; return -ENOIOCTLCMD;