|
@@ -190,7 +190,15 @@ static int remove_save_link_only(struct super_block *s,
|
|
static int reiserfs_quota_on_mount(struct super_block *, int);
|
|
static int reiserfs_quota_on_mount(struct super_block *, int);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-/* look for uncompleted unlinks and truncates and complete them */
|
|
|
|
|
|
+/*
|
|
|
|
+ * Look for uncompleted unlinks and truncates and complete them
|
|
|
|
+ *
|
|
|
|
+ * Called with superblock write locked. If quotas are enabled, we have to
|
|
|
|
+ * release/retake lest we call dquot_quota_on_mount(), proceed to
|
|
|
|
+ * schedule_on_each_cpu() in invalidate_bdev() and deadlock waiting for the per
|
|
|
|
+ * cpu worklets to complete flush_async_commits() that in turn wait for the
|
|
|
|
+ * superblock write lock.
|
|
|
|
+ */
|
|
static int finish_unfinished(struct super_block *s)
|
|
static int finish_unfinished(struct super_block *s)
|
|
{
|
|
{
|
|
INITIALIZE_PATH(path);
|
|
INITIALIZE_PATH(path);
|
|
@@ -237,7 +245,9 @@ static int finish_unfinished(struct super_block *s)
|
|
quota_enabled[i] = 0;
|
|
quota_enabled[i] = 0;
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
+ reiserfs_write_unlock(s);
|
|
ret = reiserfs_quota_on_mount(s, i);
|
|
ret = reiserfs_quota_on_mount(s, i);
|
|
|
|
+ reiserfs_write_lock(s);
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
reiserfs_warning(s, "reiserfs-2500",
|
|
reiserfs_warning(s, "reiserfs-2500",
|
|
"cannot turn on journaled "
|
|
"cannot turn on journaled "
|