quota: Change quota error message to print out disk and function name

[sfrench/cifs-2.6.git] / fs / quota / quota_v2.c

diff --git a/fs/quota/quota_v2.c b/fs/quota/quota_v2.c
index 135206af1458629c3cc209f09a6b213133671bce..65444d29406bf3c782b2741dc25f9dd571691096 100644 (file)
--- a/fs/quota/quota_v2.c
+++ b/fs/quota/quota_v2.c
@@ -63,9 +63,8 @@ static int v2_read_header(struct super_block *sb, int type,
        size = sb->s_op->quota_read(sb, type, (char *)dqhead,
                                    sizeof(struct v2_disk_dqheader), 0);
        if (size != sizeof(struct v2_disk_dqheader)) {
-               q_warn(KERN_WARNING "quota_v2: Failed header read:"
-                      " expected=%zd got=%zd\n",
-                       sizeof(struct v2_disk_dqheader), size);
+               quota_error(sb, "Failed header read: expected=%zd got=%zd",
+                           sizeof(struct v2_disk_dqheader), size);
                return 0;
        }
        return 1;
@@ -106,8 +105,7 @@ static int v2_read_file_info(struct super_block *sb, int type)
        size = sb->s_op->quota_read(sb, type, (char *)&dinfo,
               sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);
        if (size != sizeof(struct v2_disk_dqinfo)) {
-               q_warn(KERN_WARNING "quota_v2: Can't read info structure on device %s.\n",
-                       sb->s_id);
+               quota_error(sb, "Can't read info structure");
                return -1;
        }
        info->dqi_priv = kmalloc(sizeof(struct qtree_mem_dqinfo), GFP_NOFS);
@@ -167,8 +165,7 @@ static int v2_write_file_info(struct super_block *sb, int type)
        size = sb->s_op->quota_write(sb, type, (char *)&dinfo,
               sizeof(struct v2_disk_dqinfo), V2_DQINFOOFF);
        if (size != sizeof(struct v2_disk_dqinfo)) {
-               q_warn(KERN_WARNING "Can't write info structure on device %s.\n",
-                       sb->s_id);
+               quota_error(sb, "Can't write info structure");
                return -1;
        }
        return 0;