From e8126be290dc7060b77d18579d34dcd48077b358 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Tue, 26 Mar 2013 15:31:45 -0400 Subject: [PATCH] --- yaml --- r: 361957 b: refs/heads/master c: fdf30d1c1b386e1b73116cc7e0fb14e962b763b0 h: refs/heads/master i: 361955: 829fe1c89a7ff33bf9182c8ec3c1de00b510d4b5 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent-tree.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index af747cc52187..582880eb4da0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db1d607d3ca5cbb283cbb17d648cd7e8dc67cc7b +refs/heads/master: fdf30d1c1b386e1b73116cc7e0fb14e962b763b0 diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c index a22b5cc921ad..0d8478700d78 100644 --- a/trunk/fs/btrfs/extent-tree.c +++ b/trunk/fs/btrfs/extent-tree.c @@ -4460,7 +4460,7 @@ static void update_global_block_rsv(struct btrfs_fs_info *fs_info) spin_lock(&sinfo->lock); spin_lock(&block_rsv->lock); - block_rsv->size = num_bytes; + block_rsv->size = min_t(u64, num_bytes, 512 * 1024 * 1024); num_bytes = sinfo->bytes_used + sinfo->bytes_pinned + sinfo->bytes_reserved + sinfo->bytes_readonly +