dma/ia64: update ia64 machvecs, swiotlb.c

[safe/jmp/linux-2.6] / fs / quota_v2.c

diff --git a/fs/quota_v2.c b/fs/quota_v2.c
index b4199ec..23b647f 100644 (file)
--- a/fs/quota_v2.c
+++ b/fs/quota_v2.c
@@ -59,6 +59,9 @@ static int v2_read_file_info(struct super_block *sb, int type)
                        sb->s_id);
                return -1;
        }
+       /* limits are stored as unsigned 32-bit data */
+       info->dqi_maxblimit = 0xffffffff;
+       info->dqi_maxilimit = 0xffffffff;
        info->dqi_bgrace = le32_to_cpu(dinfo.dqi_bgrace);
        info->dqi_igrace = le32_to_cpu(dinfo.dqi_igrace);
        info->dqi_flags = le32_to_cpu(dinfo.dqi_flags);
@@ -394,7 +397,7 @@ static int v2_write_dquot(struct dquot *dquot)
        ssize_t ret;
        struct v2_disk_dqblk ddquot, empty;
 
-       /* dq_off is guarded by dqio_sem */
+       /* dq_off is guarded by dqio_mutex */
        if (!dquot->dq_off)
                if ((ret = dq_insert_tree(dquot)) < 0) {
                        printk(KERN_ERR "VFS: Error %zd occurred while creating quota.\n", ret);