Part 2/8:
incrementing ->s_active is pulled from do_add_mount() into get_sb_...() and
further into read_super() and get_empty_super(). All that shifting is within
mount_sem exclusion areas, so it's an equivalent transformation (see above).
diff -urN S8-pre7-mnt_instances/fs/super.c S8-pre7-s_active/fs/super.c
--- S8-pre7-mnt_instances/fs/super.c Thu Aug 9 19:07:31 2001
+++ S8-pre7-s_active/fs/super.c Thu Aug 9 19:07:31 2001
@@ -388,7 +388,6 @@
spin_lock(&dcache_lock);
list_add(&mnt->mnt_list, vfsmntlist.prev);
spin_unlock(&dcache_lock);
- atomic_inc(&sb->s_active);
if (sb->s_type->fs_flags & FS_SINGLE)
get_filesystem(sb->s_type);
out:
@@ -740,6 +739,7 @@
s = sb_entry(s->s_list.next)) {
if (s->s_dev)
continue;
+ atomic_inc(&s->s_active);
return s;
}
/* Need a new one... */
@@ -755,7 +755,7 @@
INIT_LIST_HEAD(&s->s_files);
init_rwsem(&s->s_umount);
sema_init(&s->s_lock, 1);
- atomic_set(&s->s_active, 0);
+ atomic_set(&s->s_active, 1);
sema_init(&s->s_vfs_rename_sem,1);
sema_init(&s->s_nfsd_free_path_sem,1);
sema_init(&s->s_dquot.dqio_sem, 1);
@@ -794,6 +794,7 @@
s->s_bdev = 0;
s->s_type = NULL;
unlock_super(s);
+ atomic_dec(&s->s_active);
return NULL;
}
@@ -860,6 +861,7 @@
if (fs_type == sb->s_type &&
((flags ^ sb->s_flags) & MS_RDONLY) == 0) {
path_release(&nd);
+ atomic_inc(&sb->s_active);
return sb;
}
} else {
@@ -923,6 +925,7 @@
if (!sb)
BUG();
do_remount_sb(sb, flags, data);
+ atomic_inc(&sb->s_active);
return sb;
}
@@ -1038,7 +1041,6 @@
mnt->mnt_root = dget(sb->s_root);
mnt->mnt_mountpoint = mnt->mnt_root;
mnt->mnt_parent = mnt;
- atomic_inc(&sb->s_active);
type->kern_mnt = mnt;
return mnt;
}
@@ -1315,7 +1317,6 @@
mnt->mnt_root = dget(sb->s_root);
mnt->mnt_mountpoint = mnt->mnt_root;
mnt->mnt_parent = mnt;
- atomic_inc(&sb->s_active);
/* Something was mounted here while we slept */
while(d_mountpoint(nd->dentry) && follow_down(&nd->mnt, &nd->dentry))
@@ -1573,6 +1574,7 @@
sb = get_super(ROOT_DEV);
if (sb) {
fs_type = sb->s_type;
+ atomic_inc(&sb->s_active);
goto mount_it;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Aug 15 2001 - 21:00:31 EST