Commit db1fc957 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Fix dquot_transfer for filesystems different from ext4
parents 00fdb75b 05b5d898

fs/quota/dquot.c

+3 −0
Original line number Diff line number Diff line
@@ -1377,6 +1377,9 @@ static void inode_sub_rsv_space(struct inode *inode, qsize_t number) 
static qsize_t inode_get_rsv_space(struct inode *inode)

{

	qsize_t ret;



	if (!inode->i_sb->dq_op->get_reserved_space)

		return 0;

	spin_lock(&inode->i_lock);

	ret = *inode_reserved_space(inode);

	spin_unlock(&inode->i_lock);