projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nilfs2: get rid of nilfs_mount_options structure
[cascardo/linux.git]
/
fs
/
nilfs2
/
super.c
diff --git
a/fs/nilfs2/super.c
b/fs/nilfs2/super.c
index
e2dcc9c
..
6ea32d9
100644
(file)
--- a/
fs/nilfs2/super.c
+++ b/
fs/nilfs2/super.c
@@
-111,12
+111,17
@@
void nilfs_error(struct super_block *sb, const char *function,
const char *fmt, ...)
{
struct nilfs_sb_info *sbi = NILFS_SB(sb);
const char *fmt, ...)
{
struct nilfs_sb_info *sbi = NILFS_SB(sb);
+ struct va_format vaf;
va_list args;
va_start(args, fmt);
va_list args;
va_start(args, fmt);
- printk(KERN_CRIT "NILFS error (device %s): %s: ", sb->s_id, function);
- vprintk(fmt, args);
- printk("\n");
+
+ vaf.fmt = fmt;
+ vaf.va = &args;
+
+ printk(KERN_CRIT "NILFS error (device %s): %s: %pV\n",
+ sb->s_id, function, &vaf);
+
va_end(args);
if (!(sb->s_flags & MS_RDONLY)) {
va_end(args);
if (!(sb->s_flags & MS_RDONLY)) {
@@
-136,13
+141,17
@@
void nilfs_error(struct super_block *sb, const char *function,
void nilfs_warning(struct super_block *sb, const char *function,
const char *fmt, ...)
{
void nilfs_warning(struct super_block *sb, const char *function,
const char *fmt, ...)
{
+ struct va_format vaf;
va_list args;
va_start(args, fmt);
va_list args;
va_start(args, fmt);
- printk(KERN_WARNING "NILFS warning (device %s): %s: ",
- sb->s_id, function);
- vprintk(fmt, args);
- printk("\n");
+
+ vaf.fmt = fmt;
+ vaf.va = &args;
+
+ printk(KERN_WARNING "NILFS warning (device %s): %s: %pV\n",
+ sb->s_id, function, &vaf);
+
va_end(args);
}
va_end(args);
}
@@
-1010,11
+1019,11
@@
static int nilfs_remount(struct super_block *sb, int *flags, char *data)
struct nilfs_sb_info *sbi = NILFS_SB(sb);
struct the_nilfs *nilfs = sbi->s_nilfs;
unsigned long old_sb_flags;
struct nilfs_sb_info *sbi = NILFS_SB(sb);
struct the_nilfs *nilfs = sbi->s_nilfs;
unsigned long old_sb_flags;
-
struct nilfs_mount_options old_opts
;
+
unsigned long old_mount_opt
;
int err;
old_sb_flags = sb->s_flags;
int err;
old_sb_flags = sb->s_flags;
- old_
opts.
mount_opt = sbi->s_mount_opt;
+ old_mount_opt = sbi->s_mount_opt;
if (!parse_options(data, sb, 1)) {
err = -EINVAL;
if (!parse_options(data, sb, 1)) {
err = -EINVAL;
@@
-1083,7
+1092,7
@@
static int nilfs_remount(struct super_block *sb, int *flags, char *data)
restore_opts:
sb->s_flags = old_sb_flags;
restore_opts:
sb->s_flags = old_sb_flags;
- sbi->s_mount_opt = old_
opts.
mount_opt;
+ sbi->s_mount_opt = old_mount_opt;
return err;
}
return err;
}