diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
| commit | e93721a70263afefbac781f575bfe851c6f95d84 (patch) | |
| tree | ab359f12a0688802aa99339bae82c51763dae9f6 /fs/libfs.c | |
| parent | ae1ec5e1e97f67d41e641a73380129e5905e41cc (diff) | |
| parent | c87d9732004b3f8fd82d729f12ccfb96c0df279e (diff) | |
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
Diffstat (limited to 'fs/libfs.c')
| -rw-r--r-- | fs/libfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/libfs.c b/fs/libfs.c index cd223190c4e9..80046ddf5063 100644 --- a/fs/libfs.c +++ b/fs/libfs.c | |||
| @@ -246,8 +246,7 @@ int get_sb_pseudo(struct file_system_type *fs_type, char *name, | |||
| 246 | return 0; | 246 | return 0; |
| 247 | 247 | ||
| 248 | Enomem: | 248 | Enomem: |
| 249 | up_write(&s->s_umount); | 249 | deactivate_locked_super(s); |
| 250 | deactivate_super(s); | ||
| 251 | return -ENOMEM; | 250 | return -ENOMEM; |
| 252 | } | 251 | } |
| 253 | 252 | ||