summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/free-space-cache.c
diff options
context:
space:
mode:
authorJosef Bacik2011-10-05 22:33:53 +0200
committerJosef Bacik2011-10-19 21:12:53 +0200
commit549b4fdb8f3c0708bbc0ee12ff955cd206c0f60c (patch)
tree8ee21d81f99dd2efd801c59c1d5eaf800f6b0ec0 /fs/btrfs/free-space-cache.c
parentBtrfs: add a io_ctl struct and helpers for dealing with the space cache (diff)
downloadkernel-qcow2-linux-549b4fdb8f3c0708bbc0ee12ff955cd206c0f60c.tar.gz
kernel-qcow2-linux-549b4fdb8f3c0708bbc0ee12ff955cd206c0f60c.tar.xz
kernel-qcow2-linux-549b4fdb8f3c0708bbc0ee12ff955cd206c0f60c.zip
Btrfs: check the return value of filemap_write_and_wait in the space cache
We need to check the return value of filemap_write_and_wait in the space cache writeout code. Also don't set the inode's generation until we're sure nothing else is going to fail. Thanks, Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs/free-space-cache.c')
-rw-r--r--fs/btrfs/free-space-cache.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index 35bfc13c9d42..abc924c9467c 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -852,9 +852,10 @@ int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode,
if (ret)
goto out;
- BTRFS_I(inode)->generation = trans->transid;
- filemap_write_and_wait(inode->i_mapping);
+ ret = filemap_write_and_wait(inode->i_mapping);
+ if (ret)
+ goto out;
key.objectid = BTRFS_FREE_SPACE_OBJECTID;
key.offset = offset;
@@ -884,6 +885,8 @@ int __btrfs_write_out_cache(struct btrfs_root *root, struct inode *inode,
goto out;
}
}
+
+ BTRFS_I(inode)->generation = trans->transid;
header = btrfs_item_ptr(leaf, path->slots[0],
struct btrfs_free_space_header);
btrfs_set_free_space_entries(leaf, header, entries);