Commit fa7c1d50 authored by Mateusz Guzik's avatar Mateusz Guzik Committed by Al Viro

vfs: factor sb iteration out of do_emergency_remount

The intent is to reduce code duplication with other code
iterating the list.

No functional changes.
Signed-off-by: default avatarMateusz Guzik <mguzik@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9e66317d
...@@ -574,6 +574,28 @@ void drop_super_exclusive(struct super_block *sb) ...@@ -574,6 +574,28 @@ void drop_super_exclusive(struct super_block *sb)
} }
EXPORT_SYMBOL(drop_super_exclusive); EXPORT_SYMBOL(drop_super_exclusive);
static void __iterate_supers(void (*f)(struct super_block *))
{
struct super_block *sb, *p = NULL;
spin_lock(&sb_lock);
list_for_each_entry(sb, &super_blocks, s_list) {
if (hlist_unhashed(&sb->s_instances))
continue;
sb->s_count++;
spin_unlock(&sb_lock);
f(sb);
spin_lock(&sb_lock);
if (p)
__put_super(p);
p = sb;
}
if (p)
__put_super(p);
spin_unlock(&sb_lock);
}
/** /**
* iterate_supers - call function for all active superblocks * iterate_supers - call function for all active superblocks
* @f: function to call * @f: function to call
...@@ -881,33 +903,22 @@ int do_remount_sb(struct super_block *sb, int sb_flags, void *data, int force) ...@@ -881,33 +903,22 @@ int do_remount_sb(struct super_block *sb, int sb_flags, void *data, int force)
return retval; return retval;
} }
static void do_emergency_remount(struct work_struct *work) static void do_emergency_remount_callback(struct super_block *sb)
{ {
struct super_block *sb, *p = NULL; down_write(&sb->s_umount);
if (sb->s_root && sb->s_bdev && (sb->s_flags & SB_BORN) &&
spin_lock(&sb_lock); !sb_rdonly(sb)) {
list_for_each_entry(sb, &super_blocks, s_list) { /*
if (hlist_unhashed(&sb->s_instances)) * What lock protects sb->s_flags??
continue; */
sb->s_count++; do_remount_sb(sb, SB_RDONLY, NULL, 1);
spin_unlock(&sb_lock);
down_write(&sb->s_umount);
if (sb->s_root && sb->s_bdev && (sb->s_flags & SB_BORN) &&
!sb_rdonly(sb)) {
/*
* What lock protects sb->s_flags??
*/
do_remount_sb(sb, SB_RDONLY, NULL, 1);
}
up_write(&sb->s_umount);
spin_lock(&sb_lock);
if (p)
__put_super(p);
p = sb;
} }
if (p) up_write(&sb->s_umount);
__put_super(p); }
spin_unlock(&sb_lock);
static void do_emergency_remount(struct work_struct *work)
{
__iterate_supers(do_emergency_remount_callback);
kfree(work); kfree(work);
printk("Emergency Remount complete\n"); printk("Emergency Remount complete\n");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment