diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2009-07-07 23:22:12 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-07-09 00:34:02 +0200 |
| commit | 8b712cd58adfe6aeeb0be4ecc011dc35620719e7 (patch) | |
| tree | 98a0cdc0b210392fc0fd0feb464603224c2863b1 /fs/ocfs2/super.c | |
| parent | x86: don't clear nodes_states[N_NORMAL_MEMORY] when numa is not compiled in (diff) | |
| download | linux-8b712cd58adfe6aeeb0be4ecc011dc35620719e7.tar.xz linux-8b712cd58adfe6aeeb0be4ecc011dc35620719e7.zip | |
ocfs2: Fixup orphan scan cleanup after failed mount
If the mount fails for any reason, ocfs2_dismount_volume calls
ocfs2_orphan_scan_stop. It requires that ocfs2_orphan_scan_init
be called to setup the mutex and work queues, but that doesn't
happen if the mount has failed and we oops accessing an uninitialized
work queue.
This patch splits the init and startup of the orphan scan, eliminating
the oops.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/ocfs2/super.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 7efb349fb9bd..63af2e36d834 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1182,7 +1182,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) wake_up(&osb->osb_mount_event); /* Start this when the mount is almost sure of being successful */ - ocfs2_orphan_scan_init(osb); + ocfs2_orphan_scan_start(osb); mlog_exit(status); return status; @@ -1981,6 +1981,8 @@ static int ocfs2_initialize_super(struct super_block *sb, snprintf(osb->dev_str, sizeof(osb->dev_str), "%u,%u", MAJOR(osb->sb->s_dev), MINOR(osb->sb->s_dev)); + ocfs2_orphan_scan_init(osb); + status = ocfs2_recovery_init(osb); if (status) { mlog(ML_ERROR, "Unable to initialize recovery state\n"); |