|
@@ -1519,9 +1519,7 @@ static int read_super_block(struct super_block *s, int offset)
|
|
|
static int reread_meta_blocks(struct super_block *s)
|
|
|
{
|
|
|
ll_rw_block(READ, 1, &(SB_BUFFER_WITH_SB(s)));
|
|
|
- reiserfs_write_unlock(s);
|
|
|
wait_on_buffer(SB_BUFFER_WITH_SB(s));
|
|
|
- reiserfs_write_lock(s);
|
|
|
if (!buffer_uptodate(SB_BUFFER_WITH_SB(s))) {
|
|
|
reiserfs_warning(s, "reiserfs-2504", "error reading the super");
|
|
|
return 1;
|
|
@@ -1837,24 +1835,14 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
|
|
|
*/
|
|
|
}
|
|
|
|
|
|
- /*
|
|
|
- * This path assumed to be called with the BKL in the old times.
|
|
|
- * Now we have inherited the big reiserfs lock from it and many
|
|
|
- * reiserfs helpers called in the mount path and elsewhere require
|
|
|
- * this lock to be held even if it's not always necessary. Let's be
|
|
|
- * conservative and hold it early. The window can be reduced after
|
|
|
- * careful review of the code.
|
|
|
- */
|
|
|
- reiserfs_write_lock(s);
|
|
|
-
|
|
|
if (reread_meta_blocks(s)) {
|
|
|
SWARN(silent, s, "jmacd-9",
|
|
|
"unable to reread meta blocks after journal init");
|
|
|
- goto error;
|
|
|
+ goto error_unlocked;
|
|
|
}
|
|
|
|
|
|
if (replay_only(s))
|
|
|
- goto error;
|
|
|
+ goto error_unlocked;
|
|
|
|
|
|
if (bdev_read_only(s->s_bdev) && !(s->s_flags & MS_RDONLY)) {
|
|
|
SWARN(silent, s, "clm-7000",
|
|
@@ -1868,9 +1856,19 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
|
|
|
reiserfs_init_locked_inode, (void *)(&args));
|
|
|
if (!root_inode) {
|
|
|
SWARN(silent, s, "jmacd-10", "get root inode failed");
|
|
|
- goto error;
|
|
|
+ goto error_unlocked;
|
|
|
}
|
|
|
|
|
|
+ /*
|
|
|
+ * This path assumed to be called with the BKL in the old times.
|
|
|
+ * Now we have inherited the big reiserfs lock from it and many
|
|
|
+ * reiserfs helpers called in the mount path and elsewhere require
|
|
|
+ * this lock to be held even if it's not always necessary. Let's be
|
|
|
+ * conservative and hold it early. The window can be reduced after
|
|
|
+ * careful review of the code.
|
|
|
+ */
|
|
|
+ reiserfs_write_lock(s);
|
|
|
+
|
|
|
if (root_inode->i_state & I_NEW) {
|
|
|
reiserfs_read_locked_inode(root_inode, &args);
|
|
|
unlock_new_inode(root_inode);
|