diff options
| author | Jan Kara <jack@suse.cz> | 2010-01-06 18:03:36 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-01-11 13:06:41 +0100 |
| commit | 05b5d898235401c489c68e1f3bc5706a29ad5713 (patch) | |
| tree | 2f8efc6ff1152ed53d297843891b6232a3e14eb1 | |
| parent | 3c8ad49b015eb115fbd6982f56d530f53cf57f84 (diff) | |
| download | blackbird-op-linux-05b5d898235401c489c68e1f3bc5706a29ad5713.tar.gz blackbird-op-linux-05b5d898235401c489c68e1f3bc5706a29ad5713.zip | |
quota: Fix dquot_transfer for filesystems different from ext4
Commit fd8fbfc1 modified the way we find amount of reserved space
belonging to an inode. The amount of reserved space is checked
from dquot_transfer and thus inode_reserved_space gets called
even for filesystems that don't provide get_reserved_space callback
which results in a BUG.
Fix the problem by checking get_reserved_space callback and return 0 if
the filesystem does not provide it.
CC: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Jan Kara <jack@suse.cz>
| -rw-r--r-- | fs/quota/dquot.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index dea86abdf2e7..3fc62b097bed 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); |
