Skip to content

Commit d53d0f7

Browse files
author
Al Viro
committed
ceph: use errorfc() and friends instead of spelling the prefix out
Signed-off-by: Al Viro <[email protected]>
1 parent a3ff937 commit d53d0f7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

fs/ceph/cache.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc, struct fs_context *fc)
6767
if (uniq_len && memcmp(ent->uniquifier, fscache_uniq, uniq_len))
6868
continue;
6969

70-
errorf(fc, "ceph: fscache cookie already registered for fsid %pU, use fsc=<uniquifier> option",
70+
errorfc(fc, "fscache cookie already registered for fsid %pU, use fsc=<uniquifier> option",
7171
fsid);
7272
err = -EBUSY;
7373
goto out_unlock;
@@ -96,7 +96,7 @@ int ceph_fscache_register_fs(struct ceph_fs_client* fsc, struct fs_context *fc)
9696
list_add_tail(&ent->list, &ceph_fscache_list);
9797
} else {
9898
kfree(ent);
99-
errorf(fc, "ceph: unable to register fscache cookie for fsid %pU",
99+
errorfc(fc, "unable to register fscache cookie for fsid %pU",
100100
fsid);
101101
/* all other fs ignore this error */
102102
}

fs/ceph/super.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static int ceph_parse_source(struct fs_parameter *param, struct fs_context *fc)
222222

223223
dout("%s '%s'\n", __func__, dev_name);
224224
if (!dev_name || !*dev_name)
225-
return invalf(fc, "ceph: Empty source");
225+
return invalfc(fc, "Empty source");
226226

227227
dev_name_end = strchr(dev_name, '/');
228228
if (dev_name_end) {
@@ -238,7 +238,7 @@ static int ceph_parse_source(struct fs_parameter *param, struct fs_context *fc)
238238

239239
dev_name_end--; /* back up to ':' separator */
240240
if (dev_name_end < dev_name || *dev_name_end != ':')
241-
return invalf(fc, "ceph: No path or : separator in source");
241+
return invalfc(fc, "No path or : separator in source");
242242

243243
dout("device name '%.*s'\n", (int)(dev_name_end - dev_name), dev_name);
244244
if (fsopt->server_path)
@@ -294,7 +294,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
294294
break;
295295
case Opt_source:
296296
if (fc->source)
297-
return invalf(fc, "ceph: Multiple sources specified");
297+
return invalfc(fc, "Multiple sources specified");
298298
return ceph_parse_source(param, fc);
299299
case Opt_wsize:
300300
if (result.uint_32 < PAGE_SIZE ||
@@ -385,7 +385,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
385385
}
386386
break;
387387
#else
388-
return invalf(fc, "ceph: fscache support is disabled");
388+
return invalfc(fc, "fscache support is disabled");
389389
#endif
390390
case Opt_poolperm:
391391
if (!result.negated)
@@ -416,7 +416,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
416416
#ifdef CONFIG_CEPH_FS_POSIX_ACL
417417
fc->sb_flags |= SB_POSIXACL;
418418
#else
419-
return invalf(fc, "ceph: POSIX ACL support is disabled");
419+
return invalfc(fc, "POSIX ACL support is disabled");
420420
#endif
421421
} else {
422422
fc->sb_flags &= ~SB_POSIXACL;
@@ -428,7 +428,7 @@ static int ceph_parse_mount_param(struct fs_context *fc,
428428
return 0;
429429

430430
out_of_range:
431-
return invalf(fc, "ceph: %s out of range", param->key);
431+
return invalfc(fc, "%s out of range", param->key);
432432
}
433433

434434
static void destroy_mount_options(struct ceph_mount_options *args)
@@ -1012,7 +1012,7 @@ static int ceph_get_tree(struct fs_context *fc)
10121012
dout("ceph_get_tree\n");
10131013

10141014
if (!fc->source)
1015-
return invalf(fc, "ceph: No source");
1015+
return invalfc(fc, "No source");
10161016

10171017
#ifdef CONFIG_CEPH_FS_POSIX_ACL
10181018
fc->sb_flags |= SB_POSIXACL;

0 commit comments

Comments
 (0)