| Message ID | 20250329-work-freeze-v2-1-a47af37ecc3d@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Extend freeze support to suspend and hibernate | expand |
On Sat 29-03-25 09:42:14, Christian Brauner wrote: > The locking guarantees that the superblock is alive and sb->s_root is > still set. Remove the pointless check. > > Signed-off-by: Christian Brauner <brauner@kernel.org> Looks good. In fact most sb->s_root checks in fs/super.c look pointless these days since AFAICT if you have SB_BORN && !SB_DYING superblock (as super_lock_*() ascertains), then sb->s_root != NULL. Anyway feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/super.c | 19 ++++++------------- > 1 file changed, 6 insertions(+), 13 deletions(-) > > diff --git a/fs/super.c b/fs/super.c > index 97a17f9d9023..dc14f4bf73a6 100644 > --- a/fs/super.c > +++ b/fs/super.c > @@ -930,8 +930,7 @@ void iterate_supers(void (*f)(struct super_block *, void *), void *arg) > > locked = super_lock_shared(sb); > if (locked) { > - if (sb->s_root) > - f(sb, arg); > + f(sb, arg); > super_unlock_shared(sb); > } > > @@ -967,11 +966,8 @@ void iterate_supers_type(struct file_system_type *type, > spin_unlock(&sb_lock); > > locked = super_lock_shared(sb); > - if (locked) { > - if (sb->s_root) > - f(sb, arg); > - super_unlock_shared(sb); > - } > + if (locked) > + f(sb, arg); > > spin_lock(&sb_lock); > if (p) > @@ -991,18 +987,15 @@ struct super_block *user_get_super(dev_t dev, bool excl) > > spin_lock(&sb_lock); > list_for_each_entry(sb, &super_blocks, s_list) { > - if (sb->s_dev == dev) { > + if (sb->s_dev == dev) { > bool locked; > > sb->s_count++; > spin_unlock(&sb_lock); > /* still alive? */ > locked = super_lock(sb, excl); > - if (locked) { > - if (sb->s_root) > - return sb; > - super_unlock(sb, excl); > - } > + if (locked) > + return sb; /* caller will drop */ > /* nope, got unmounted */ > spin_lock(&sb_lock); > __put_super(sb); > > -- > 2.47.2 >
diff --git a/fs/super.c b/fs/super.c index 97a17f9d9023..dc14f4bf73a6 100644 --- a/fs/super.c +++ b/fs/super.c @@ -930,8 +930,7 @@ void iterate_supers(void (*f)(struct super_block *, void *), void *arg) locked = super_lock_shared(sb); if (locked) { - if (sb->s_root) - f(sb, arg); + f(sb, arg); super_unlock_shared(sb); } @@ -967,11 +966,8 @@ void iterate_supers_type(struct file_system_type *type, spin_unlock(&sb_lock); locked = super_lock_shared(sb); - if (locked) { - if (sb->s_root) - f(sb, arg); - super_unlock_shared(sb); - } + if (locked) + f(sb, arg); spin_lock(&sb_lock); if (p) @@ -991,18 +987,15 @@ struct super_block *user_get_super(dev_t dev, bool excl) spin_lock(&sb_lock); list_for_each_entry(sb, &super_blocks, s_list) { - if (sb->s_dev == dev) { + if (sb->s_dev == dev) { bool locked; sb->s_count++; spin_unlock(&sb_lock); /* still alive? */ locked = super_lock(sb, excl); - if (locked) { - if (sb->s_root) - return sb; - super_unlock(sb, excl); - } + if (locked) + return sb; /* caller will drop */ /* nope, got unmounted */ spin_lock(&sb_lock); __put_super(sb);
The locking guarantees that the superblock is alive and sb->s_root is still set. Remove the pointless check. Signed-off-by: Christian Brauner <brauner@kernel.org> --- fs/super.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)