A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Push BKL down into do_remount_sb()

Browse source 
[folded fix from Jiri Slaby]

Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
Al Viro 2009-05-08 13:36:58 -04:00
commit 4aa98cf768
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
fs/super.c
View file

@ -542,25 +542,33 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
shrink_dcache_sb(sb);
sync_filesystem(sb);
lock_kernel();
/* If we are remounting RDONLY and current sb is read/write,
make sure there are no rw files opened */
if ((flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY)) {
if (force)
mark_files_ro(sb);
else if (!fs_may_remount_ro(sb))
else if (!fs_may_remount_ro(sb)) {
unlock_kernel();
return -EBUSY;
}
retval = vfs_dq_off(sb, 1);
if (retval < 0 && retval != -ENOSYS)
if (retval < 0 && retval != -ENOSYS) {
unlock_kernel();
return -EBUSY;
}
}
remount_rw = !(flags & MS_RDONLY) && (sb->s_flags & MS_RDONLY);
if (sb->s_op->remount_fs) {
retval = sb->s_op->remount_fs(sb, &flags, data);
if (retval)
if (retval) {
unlock_kernel();
return retval;
}
}
sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
unlock_kernel();
if (remount_rw)
vfs_dq_quota_on_remount(sb);
return 0;
@ -581,9 +589,7 @@ static void do_emergency_remount(struct work_struct *work)
*
* What lock protects sb->s_flags??
*/
lock_kernel();
do_remount_sb(sb, MS_RDONLY, NULL, 1);
unlock_kernel();
}
up_write(&sb->s_umount);
put_super(sb);