diff options
author | Christoph Hellwig <hch@lst.de> | 2009-05-05 09:41:25 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-11 21:36:06 -0400 |
commit | 5af7926ff33b68b3ba46531471c6e0564b285efc (patch) | |
tree | a25266f9db482ce9dd8e663148ffb0f1a524bd83 /fs/btrfs/super.c | |
parent | e5004753388dcf5e1b8a52ac0ab807d232340fbb (diff) |
enforce ->sync_fs is only called for rw superblock
Make sure a superblock really is writeable by checking MS_RDONLY
under s_umount. sync_filesystems needed some re-arragement for
that, but all but one sync_filesystem caller had the correct locking
already so that we could add that check there. cachefiles grew
s_umount locking.
I've also added a WARN_ON to sync_filesystem to assert this for
future callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r-- | fs/btrfs/super.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 52d84522c2c2..9f179d4832d5 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
@@ -394,9 +394,6 @@ int btrfs_sync_fs(struct super_block *sb, int wait) | |||
394 | struct btrfs_root *root = btrfs_sb(sb); | 394 | struct btrfs_root *root = btrfs_sb(sb); |
395 | int ret; | 395 | int ret; |
396 | 396 | ||
397 | if (sb->s_flags & MS_RDONLY) | ||
398 | return 0; | ||
399 | |||
400 | if (!wait) { | 397 | if (!wait) { |
401 | filemap_flush(root->fs_info->btree_inode->i_mapping); | 398 | filemap_flush(root->fs_info->btree_inode->i_mapping); |
402 | return 0; | 399 | return 0; |