diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 14:49:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 14:49:16 -0800 |
| commit | e19c29e8d8d3b2dbc4c9a859f40c3f95ed089441 (patch) | |
| tree | 9fb1d7c2973bbcae7632d4380868ef8c9ce40713 /fs/super.c | |
| parent | afd290945cd283030b51b433a66fe57a8feb28c8 (diff) | |
| parent | 8bc5191b261c4fd9a5e9052cebe04ce2ef05f2e7 (diff) | |
| download | linux-e19c29e8d8d3b2dbc4c9a859f40c3f95ed089441.tar.gz linux-e19c29e8d8d3b2dbc4c9a859f40c3f95ed089441.tar.bz2 linux-e19c29e8d8d3b2dbc4c9a859f40c3f95ed089441.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
qnx4: don't leak ->BitMap on late failure exits
qnx4: reduce the insane nesting in qnx4_checkroot()
qnx4: di_fname is an array, for crying out loud...
vfs: remove printk from set_nlink()
wake up s_wait_unfrozen when ->freeze_fs fails
Diffstat (limited to 'fs/super.c')
| -rw-r--r-- | fs/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/super.c b/fs/super.c index de41e1e46f09..6015c02296b7 100644 --- a/fs/super.c +++ b/fs/super.c @@ -1186,6 +1186,8 @@ int freeze_super(struct super_block *sb) printk(KERN_ERR "VFS:Filesystem freeze failed\n"); sb->s_frozen = SB_UNFROZEN; + smp_wmb(); + wake_up(&sb->s_wait_unfrozen); deactivate_locked_super(sb); return ret; } |