iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext4: rename s_resize_flags to s_ext4_flags

Browse Source 
We are currently using one bit in s_resize_flags; rename it in order
to allow more of the bits in that unsigned long for other purposes.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2017-02-05 01:27:48 -05:00
parent 4753d8a24d
commit 9549a168bd
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/ext4/ext4.h
View File

@ -1399,8 +1399,7 @@ struct ext4_sb_info {
struct journal_s *s_journal; struct journal_s *s_journal;
struct list_head s_orphan; struct list_head s_orphan;
struct mutex s_orphan_lock; struct mutex s_orphan_lock;
unsigned long s_resize_flags; /* Flags indicating if there unsigned long s_ext4_flags; /* Ext4 superblock flags */
is a resizer */
unsigned long s_commit_interval; unsigned long s_commit_interval;
u32 s_max_batch_time; u32 s_max_batch_time;
u32 s_min_batch_time; u32 s_min_batch_time;
@ -1833,6 +1832,12 @@ static inline bool ext4_has_incompat_features(struct super_block *sb)
return (EXT4_SB(sb)->s_es->s_feature_incompat != 0); return (EXT4_SB(sb)->s_es->s_feature_incompat != 0);
} }
/*
* Superblock flags
*/
#define EXT4_FLAGS_RESIZING 0
/* /*
* Default values for user and/or group using reserved blocks * Default values for user and/or group using reserved blocks
*/ */
@ -3217,7 +3222,6 @@ static inline void ext4_inode_resume_unlocked_dio(struct inode *inode)
EXT4_WQ_HASH_SZ]) EXT4_WQ_HASH_SZ])
extern wait_queue_head_t ext4__ioend_wq[EXT4_WQ_HASH_SZ]; extern wait_queue_head_t ext4__ioend_wq[EXT4_WQ_HASH_SZ];
#define EXT4_RESIZING 0
extern int ext4_resize_begin(struct super_block *sb); extern int ext4_resize_begin(struct super_block *sb);
extern void ext4_resize_end(struct super_block *sb); extern void ext4_resize_end(struct super_block *sb);

5
fs/ext4/resize.c
View File

@ -45,7 +45,8 @@ int ext4_resize_begin(struct super_block *sb)
return -EPERM; return -EPERM;
} }
if (test_and_set_bit_lock(EXT4_RESIZING, &EXT4_SB(sb)->s_resize_flags)) if (test_and_set_bit_lock(EXT4_FLAGS_RESIZING,
&EXT4_SB(sb)->s_ext4_flags))
ret = -EBUSY; ret = -EBUSY;
return ret; return ret;
@ -53,7 +54,7 @@ int ext4_resize_begin(struct super_block *sb)
void ext4_resize_end(struct super_block *sb) void ext4_resize_end(struct super_block *sb)
{ {
clear_bit_unlock(EXT4_RESIZING, &EXT4_SB(sb)->s_resize_flags); clear_bit_unlock(EXT4_FLAGS_RESIZING, &EXT4_SB(sb)->s_ext4_flags);
smp_mb__after_atomic(); smp_mb__after_atomic();
} }