1 ext4: rename s_resize_flags to s_ext4_flags
3 We are currently using one bit in s_resize_flags; rename it in order
4 to allow more of the bits in that unsigned long for other purposes.
6 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
8 fs/ext4/ext4.h | 10 +++++++---
9 fs/ext4/resize.c | 5 +++--
10 2 files changed, 10 insertions(+), 5 deletions(-)
12 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
13 index 1cd077e02517..2e7e02f2f771 100644
16 @@ -1399,8 +1399,7 @@ struct ext4_sb_info {
17 struct journal_s *s_journal;
18 struct list_head s_orphan;
19 struct mutex s_orphan_lock;
20 - unsigned long s_resize_flags; /* Flags indicating if there
22 + unsigned long s_ext4_flags; /* Ext4 superblock flags */
23 unsigned long s_commit_interval;
26 @@ -1834,6 +1833,12 @@ static inline bool ext4_has_incompat_features(struct super_block *sb)
32 +#define EXT4_FLAGS_RESIZING 0
36 * Default values for user and/or group using reserved blocks
38 #define EXT4_DEF_RESUID 0
39 @@ -3217,7 +3222,6 @@ static inline void ext4_inode_resume_unlocked_dio(struct inode *inode)
41 extern wait_queue_head_t ext4__ioend_wq[EXT4_WQ_HASH_SZ];
43 -#define EXT4_RESIZING 0
44 extern int ext4_resize_begin(struct super_block *sb);
45 extern void ext4_resize_end(struct super_block *sb);
47 diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
48 index cf681004b196..c3ed9021b781 100644
49 --- a/fs/ext4/resize.c
50 +++ b/fs/ext4/resize.c
51 @@ -45,7 +45,8 @@ int ext4_resize_begin(struct super_block *sb)
55 - if (test_and_set_bit_lock(EXT4_RESIZING, &EXT4_SB(sb)->s_resize_flags))
56 + if (test_and_set_bit_lock(EXT4_FLAGS_RESIZING,
57 + &EXT4_SB(sb)->s_ext4_flags))
61 @@ -53,7 +54,7 @@ int ext4_resize_begin(struct super_block *sb)
63 void ext4_resize_end(struct super_block *sb)
65 - clear_bit_unlock(EXT4_RESIZING, &EXT4_SB(sb)->s_resize_flags);
66 + clear_bit_unlock(EXT4_FLAGS_RESIZING, &EXT4_SB(sb)->s_ext4_flags);
67 smp_mb__after_atomic();