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

+3
+3
fs/quota/dquot.c
··· 1377 1377 static qsize_t inode_get_rsv_space(struct inode *inode) 1378 1378 { 1379 1379 qsize_t ret; 1380 + 1381 + if (!inode->i_sb->dq_op->get_reserved_space) 1382 + return 0; 1380 1383 spin_lock(&inode->i_lock); 1381 1384 ret = *inode_reserved_space(inode); 1382 1385 spin_unlock(&inode->i_lock);