Merge tag 'md-3.11' of git://neil.brown.name/md

[mirror_ubuntu-zesty-kernel.git] / fs / fat / misc.c

diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 5eb600dc43a9064257a2485dde54f8a0ce332972..628e22a5a5433dae9287bdb94b10c19c6af8a538 100644 (file)
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -30,7 +30,7 @@ void __fat_fs_error(struct super_block *sb, int report, const char *fmt, ...)
                va_start(args, fmt);
                vaf.fmt = fmt;
                vaf.va = &args;
-               printk(KERN_ERR "FAT-fs (%s): error, %pV\n", sb->s_id, &vaf);
+               fat_msg(sb, KERN_ERR, "error, %pV", &vaf);
                va_end(args);
        }
 
@@ -38,8 +38,7 @@ void __fat_fs_error(struct super_block *sb, int report, const char *fmt, ...)
                panic("FAT-fs (%s): fs panic from previous error\n", sb->s_id);
        else if (opts->errors == FAT_ERRORS_RO && !(sb->s_flags & MS_RDONLY)) {
                sb->s_flags |= MS_RDONLY;
-               printk(KERN_ERR "FAT-fs (%s): Filesystem has been "
-                               "set read-only\n", sb->s_id);
+               fat_msg(sb, KERN_ERR, "Filesystem has been set read-only");
        }
 }
 EXPORT_SYMBOL_GPL(__fat_fs_error);
@@ -135,6 +134,10 @@ int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster)
                }
                if (ret < 0)
                        return ret;
+               /*
+                * FIXME:Although we can add this cache, fat_cache_add() is
+                * assuming to be called after linear search with fat_cache_id.
+                */
 //             fat_cache_add(inode, new_fclus, new_dclus);
        } else {
                MSDOS_I(inode)->i_start = new_dclus;