Commit af0b3152 authored Aug 09, 2015 by Linus Torvalds

linux-btrfs

Pull btrfs fix from Chris Mason:
 "We have a btrfs quota regression fix.

  I merged this one on Thursday and have run it through tests against
  current master.

  Normally I wouldn't have sent this while you were finalizing rc6, but
  I'm feeding mosquitoes in the adirondacks next week, so I wanted to
  get this one out before leaving.  I'll leave longer tests running and
  check on things during the week, but I don't expect any problems"

* 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: qgroup: Fix a regression in qgroup reserved space.

parents bae1577e c05f9429

fs/btrfs/qgroup.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1651,6 +1651,11 @@ static int qgroup_update_counters(struct btrfs_fs_info *fs_info,
	/* Exclusive -> exclusive, nothing changed */		/* Exclusive -> exclusive, nothing changed */
	}		}
	}		}

			/* For exclusive extent, free its reserved bytes too */
			if (nr_old_roots == 0 && nr_new_roots == 1 &&
			cur_new_count == nr_new_roots)
			qg->reserved -= num_bytes;
	if (dirty)		if (dirty)
	qgroup_dirty(fs_info, qg);		qgroup_dirty(fs_info, qg);
	}		}