diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-12-15 13:36:29 -0500 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-12-26 22:25:26 +0800 |
| commit | 2076c3636a678812cac366b3f7328d79324ac91f (patch) | |
| tree | 79ef545199fb182cfab1e7802d3f90eb71b71e82 /fs | |
| parent | cd5be8fd9d3a199cf74d18d624704d2e497d3d2d (diff) | |
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')
| -rw-r--r-- | fs/btrfs/delayed-inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 5b163572e0c..9c1eccc2c50 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 |