diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 12:26:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-27 12:26:22 -0400 |
| commit | 333c066bb76f1f270ca77f16afe198e54e352c83 (patch) | |
| tree | 07343bcb01b28ca48c4e364a5da7dcacc0c37439 /fs/gfs2 | |
| parent | 75623437167d9d1ef14acaf6b3fb4ccd38fcbc84 (diff) | |
| parent | 19237039919088781b4191a00bdc1284d8fea1dd (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
GFS2: Fix mount hang caused by certain access pattern to sysfs files
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/ops_fstype.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index 516516e0c2a2..3bc073a4cf82 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c | |||
| @@ -1018,13 +1018,13 @@ hostdata_error: | |||
| 1018 | fsname++; | 1018 | fsname++; |
| 1019 | if (lm->lm_mount == NULL) { | 1019 | if (lm->lm_mount == NULL) { |
| 1020 | fs_info(sdp, "Now mounting FS...\n"); | 1020 | fs_info(sdp, "Now mounting FS...\n"); |
| 1021 | complete(&sdp->sd_locking_init); | 1021 | complete_all(&sdp->sd_locking_init); |
| 1022 | return 0; | 1022 | return 0; |
| 1023 | } | 1023 | } |
| 1024 | ret = lm->lm_mount(sdp, fsname); | 1024 | ret = lm->lm_mount(sdp, fsname); |
| 1025 | if (ret == 0) | 1025 | if (ret == 0) |
| 1026 | fs_info(sdp, "Joined cluster. Now mounting FS...\n"); | 1026 | fs_info(sdp, "Joined cluster. Now mounting FS...\n"); |
| 1027 | complete(&sdp->sd_locking_init); | 1027 | complete_all(&sdp->sd_locking_init); |
| 1028 | return ret; | 1028 | return ret; |
| 1029 | } | 1029 | } |
| 1030 | 1030 | ||