summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2011-12-15 13:36:29 -0500
committerChris Mason <chris.mason@oracle.com>2011-12-15 13:36:29 -0500
commite755d9ab387c4c2401dce5b6f435432a829f41cb (patch)
treefcec42ac109be4c291e03de111603fd7086fd91a /fs/btrfs
parentad19db71f498fd858dd84ce603efcf97e321f184 (diff)
downloadop-kernel-dev-e755d9ab387c4c2401dce5b6f435432a829f41cb.zip
op-kernel-dev-e755d9ab387c4c2401dce5b6f435432a829f41cb.tar.gz
Btrfs: deal with NULL srv_rsv in the delalloc inode reservation code
btrfs_update_inode is sometimes called with a null reservation. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/delayed-inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 6a1a680..c7ddf8a 100644
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -640,8 +640,8 @@ static int btrfs_delayed_inode_reserve_metadata(
* Now if src_rsv == delalloc_block_rsv we'll let it just steal since
* we're accounted for.
*/
- if (!trans->bytes_reserved &&
- src_rsv != &root->fs_info->delalloc_block_rsv) {
+ if (!src_rsv || (!trans->bytes_reserved &&
+ src_rsv != &root->fs_info->delalloc_block_rsv)) {
ret = btrfs_block_rsv_add_noflush(root, dst_rsv, num_bytes);
/*
* Since we're under a transaction reserve_metadata_bytes could
OpenPOWER on IntegriCloud