Fix "journal superblock changes" so that needs_recovery flag is
[ext4-patch-queue.git] / rename-GOINGDOWN-to-SHUTDOWN
blob65625bef3d9128b760d43190de052c5956fe8eb5
1 ext4: rename EXT4_IOC_GOINGDOWN to EXT4_IOC_SHUTDOWN
3 It's very likely the file system independent ioctl name will be
4 FS_IOC_SHUTDOWN, so let's use the same name for the ext4 ioctl name.
6 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
7 ---
8  fs/ext4/ext4.h  | 2 +-
9  fs/ext4/ioctl.c | 8 ++++----
10  2 files changed, 5 insertions(+), 5 deletions(-)
12 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
13 index e76696b303d8..9f1b9c466197 100644
14 --- a/fs/ext4/ext4.h
15 +++ b/fs/ext4/ext4.h
16 @@ -679,7 +679,7 @@ struct fsxattr {
17  #define EXT4_IOC_FSGETXATTR            FS_IOC_FSGETXATTR
18  #define EXT4_IOC_FSSETXATTR            FS_IOC_FSSETXATTR
20 -#define EXT4_IOC_GOINGDOWN _IOR ('X', 125, __u32)
21 +#define EXT4_IOC_SHUTDOWN _IOR ('X', 125, __u32)
23  /*
24   * Flags for going down operation
25 diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
26 index ba234eb5a1bd..0ecb8a6e2b1a 100644
27 --- a/fs/ext4/ioctl.c
28 +++ b/fs/ext4/ioctl.c
29 @@ -457,7 +457,7 @@ static inline unsigned long ext4_xflags_to_iflags(__u32 xflags)
30         return iflags;
31  }
33 -int ext4_goingdown(struct super_block *sb, unsigned long arg)
34 +int ext4_shutdown(struct super_block *sb, unsigned long arg)
35  {
36         struct ext4_sb_info *sbi = EXT4_SB(sb);
37         __u32 flags;
38 @@ -958,8 +958,8 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40                 return 0;
41         }
42 -       case EXT4_IOC_GOINGDOWN:
43 -               return ext4_goingdown(sb, arg);
44 +       case EXT4_IOC_SHUTDOWN:
45 +               return ext4_shutdown(sb, arg);
46         default:
47                 return -ENOTTY;
48         }
49 @@ -1026,7 +1026,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
50         case EXT4_IOC_SET_ENCRYPTION_POLICY:
51         case EXT4_IOC_GET_ENCRYPTION_PWSALT:
52         case EXT4_IOC_GET_ENCRYPTION_POLICY:
53 -       case EXT4_IOC_GOINGDOWN:
54 +       case EXT4_IOC_SHUTDOWN:
55                 break;
56         default:
57                 return -ENOIOCTLCMD;