summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-11 09:48:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-11 09:48:14 -0800
commitdb1fc95744827a04f7e127681493bf1c1d3ab688 (patch)
treefa1102999c19d48802bca87529cb493460917792 /fs
parent00fdb75b1959c2f8de8b70bfb63aca422feff2fa (diff)
parent05b5d898235401c489c68e1f3bc5706a29ad5713 (diff)
downloadop-kernel-dev-db1fc95744827a04f7e127681493bf1c1d3ab688.zip
op-kernel-dev-db1fc95744827a04f7e127681493bf1c1d3ab688.tar.gz
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
Diffstat (limited to 'fs')
-rw-r--r--fs/quota/dquot.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index dea86ab..3fc62b0 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -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);
OpenPOWER on IntegriCloud