diff options
| author | Chris Mason <clm@fb.com> | 2014-11-25 05:45:30 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-11-25 05:45:30 -0800 |
| commit | ad27c0dab76a7abc8809ec41ae59cf67de5ea906 (patch) | |
| tree | 5ae495bc5d4d3eafa54c2ca5f7c5e5482516e4ec /fs/btrfs/super.c | |
| parent | b38ef71cb102208dffcf4e8524e9d5ec4ec0eaa9 (diff) | |
| parent | a6f69dc8018dbb4ce2009ccba49b53f68c8bdc64 (diff) | |
Merge branch 'dev/pending-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 21c60ee2f664..391ec4418460 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -642,11 +642,11 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) "disabling disk space caching"); break; case Opt_inode_cache: - btrfs_set_and_info(root, CHANGE_INODE_CACHE, + btrfs_set_pending_and_info(info, INODE_MAP_CACHE, "enabling inode map caching"); break; case Opt_noinode_cache: - btrfs_clear_and_info(root, CHANGE_INODE_CACHE, + btrfs_clear_pending_and_info(info, INODE_MAP_CACHE, "disabling inode map caching"); break; case Opt_clear_cache: @@ -993,9 +993,17 @@ int btrfs_sync_fs(struct super_block *sb, int wait) trans = btrfs_attach_transaction_barrier(root); if (IS_ERR(trans)) { /* no transaction, don't bother */ - if (PTR_ERR(trans) == -ENOENT) - return 0; - return PTR_ERR(trans); + if (PTR_ERR(trans) == -ENOENT) { + /* + * Exit unless we have some pending changes + * that need to go through commit + */ + if (fs_info->pending_changes == 0) + return 0; + trans = btrfs_start_transaction(root, 0); + } else { + return PTR_ERR(trans); + } } return btrfs_commit_transaction(trans, root); } |