diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-03-05 09:06:42 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2014-03-06 12:34:06 -0500 |
commit | fc554ed3d89d220b9d0c020e19aa52fb6bf1d673 (patch) | |
tree | 8e5ec3dcd72e3ee3754785020d262e9c8baed44d /fs/gfs2/super.c | |
parent | f2113eb8a4ede4016199492f3e10f5a165b04fcd (diff) |
GFS2: global conversion to pr_foo()
-All printk(KERN_foo converted to pr_foo().
-Messages updated to fit in 80 columns.
-fs_macros converted as well.
-fs_printk removed.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r-- | fs/gfs2/super.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 25747440ebbb..584c757569a5 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
@@ -175,7 +175,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) | |||
175 | break; | 175 | break; |
176 | case Opt_debug: | 176 | case Opt_debug: |
177 | if (args->ar_errors == GFS2_ERRORS_PANIC) { | 177 | if (args->ar_errors == GFS2_ERRORS_PANIC) { |
178 | printk(KERN_WARNING "GFS2: -o debug and -o errors=panic " | 178 | pr_warn("GFS2: -o debug and -o errors=panic " |
179 | "are mutually exclusive.\n"); | 179 | "are mutually exclusive.\n"); |
180 | return -EINVAL; | 180 | return -EINVAL; |
181 | } | 181 | } |
@@ -228,21 +228,21 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) | |||
228 | case Opt_commit: | 228 | case Opt_commit: |
229 | rv = match_int(&tmp[0], &args->ar_commit); | 229 | rv = match_int(&tmp[0], &args->ar_commit); |
230 | if (rv || args->ar_commit <= 0) { | 230 | if (rv || args->ar_commit <= 0) { |
231 | printk(KERN_WARNING "GFS2: commit mount option requires a positive numeric argument\n"); | 231 | pr_warn("GFS2: commit mount option requires a positive numeric argument\n"); |
232 | return rv ? rv : -EINVAL; | 232 | return rv ? rv : -EINVAL; |
233 | } | 233 | } |
234 | break; | 234 | break; |
235 | case Opt_statfs_quantum: | 235 | case Opt_statfs_quantum: |
236 | rv = match_int(&tmp[0], &args->ar_statfs_quantum); | 236 | rv = match_int(&tmp[0], &args->ar_statfs_quantum); |
237 | if (rv || args->ar_statfs_quantum < 0) { | 237 | if (rv || args->ar_statfs_quantum < 0) { |
238 | printk(KERN_WARNING "GFS2: statfs_quantum mount option requires a non-negative numeric argument\n"); | 238 | pr_warn("GFS2: statfs_quantum mount option requires a non-negative numeric argument\n"); |
239 | return rv ? rv : -EINVAL; | 239 | return rv ? rv : -EINVAL; |
240 | } | 240 | } |
241 | break; | 241 | break; |
242 | case Opt_quota_quantum: | 242 | case Opt_quota_quantum: |
243 | rv = match_int(&tmp[0], &args->ar_quota_quantum); | 243 | rv = match_int(&tmp[0], &args->ar_quota_quantum); |
244 | if (rv || args->ar_quota_quantum <= 0) { | 244 | if (rv || args->ar_quota_quantum <= 0) { |
245 | printk(KERN_WARNING "GFS2: quota_quantum mount option requires a positive numeric argument\n"); | 245 | pr_warn("GFS2: quota_quantum mount option requires a positive numeric argument\n"); |
246 | return rv ? rv : -EINVAL; | 246 | return rv ? rv : -EINVAL; |
247 | } | 247 | } |
248 | break; | 248 | break; |
@@ -250,7 +250,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) | |||
250 | rv = match_int(&tmp[0], &args->ar_statfs_percent); | 250 | rv = match_int(&tmp[0], &args->ar_statfs_percent); |
251 | if (rv || args->ar_statfs_percent < 0 || | 251 | if (rv || args->ar_statfs_percent < 0 || |
252 | args->ar_statfs_percent > 100) { | 252 | args->ar_statfs_percent > 100) { |
253 | printk(KERN_WARNING "statfs_percent mount option requires a numeric argument between 0 and 100\n"); | 253 | pr_warn("statfs_percent mount option requires a numeric argument between 0 and 100\n"); |
254 | return rv ? rv : -EINVAL; | 254 | return rv ? rv : -EINVAL; |
255 | } | 255 | } |
256 | break; | 256 | break; |
@@ -259,7 +259,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) | |||
259 | break; | 259 | break; |
260 | case Opt_err_panic: | 260 | case Opt_err_panic: |
261 | if (args->ar_debug) { | 261 | if (args->ar_debug) { |
262 | printk(KERN_WARNING "GFS2: -o debug and -o errors=panic " | 262 | pr_warn("GFS2: -o debug and -o errors=panic " |
263 | "are mutually exclusive.\n"); | 263 | "are mutually exclusive.\n"); |
264 | return -EINVAL; | 264 | return -EINVAL; |
265 | } | 265 | } |
@@ -279,7 +279,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) | |||
279 | break; | 279 | break; |
280 | case Opt_error: | 280 | case Opt_error: |
281 | default: | 281 | default: |
282 | printk(KERN_WARNING "GFS2: invalid mount option: %s\n", o); | 282 | pr_warn("GFS2: invalid mount option: %s\n", o); |
283 | return -EINVAL; | 283 | return -EINVAL; |
284 | } | 284 | } |
285 | } | 285 | } |