From: Chris Mason Date: Thu, 15 Dec 2011 18:36:29 +0000 (-0500) Subject: Btrfs: deal with NULL srv_rsv in the delalloc inode reservation code X-Git-Tag: v3.2-rc6~4^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e755d9ab387c4c2401dce5b6f435432a829f41cb;p=profile%2Fivi%2Fkernel-x86-ivi.git 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 --- diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 6a1a6800776..c7ddf8a01c5 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