$ sudo mount -oremount,ro /
[44126.724760] ------------[ cut here ]------------
[44126.725188] kernel BUG at lib/kernel_lock.c:126!
Commit "337eb00: Push BKL down into ->remount_fs()" does not completely
push BKL down, leaving a few stray unlock_kernel() calls behind on error
paths.
Signed-off-by: Chris Wright <[email protected]>
---
fs/super.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/fs/super.c b/fs/super.c
index 83b4741..0b494b5 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -545,24 +545,19 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force)
if ((flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY)) {
if (force)
mark_files_ro(sb);
- else if (!fs_may_remount_ro(sb)) {
- unlock_kernel();
+ else if (!fs_may_remount_ro(sb))
return -EBUSY;
- }
+
retval = vfs_dq_off(sb, 1);
- if (retval < 0 && retval != -ENOSYS) {
- unlock_kernel();
+ if (retval < 0 && retval != -ENOSYS)
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) {
- unlock_kernel();
+ if (retval)
return retval;
- }
}
sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);
if (remount_rw)