summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2018-06-27 16:38:13 +0200
committerIlya Dryomov <idryomov@gmail.com>2018-08-02 21:26:11 +0200
commit2f56b6bae73b2d65ef4816ca89341facc53d3361 (patch)
tree30c4eb51affe028036234b4a3b21614b0fab647c
parent17173c82e3daa28742bf7732520e9bc2e0cb977d (diff)
downloadlinux-stable-2f56b6bae73b2d65ef4816ca89341facc53d3361.tar.gz
linux-stable-2f56b6bae73b2d65ef4816ca89341facc53d3361.tar.bz2
linux-stable-2f56b6bae73b2d65ef4816ca89341facc53d3361.zip
libceph: amend "bad option arg" error message
Don't mention "mount" -- in the rbd case it is "mapping". Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
-rw-r--r--drivers/block/rbd.c2
-rw-r--r--fs/ceph/super.c3
-rw-r--r--net/ceph/ceph_common.c3
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index fa0729c1e776..4e8949b88b05 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -786,7 +786,7 @@ static int parse_rbd_opts_token(char *c, void *private)
if (token < Opt_last_int) {
ret = match_int(&argstr[0], &intval);
if (ret < 0) {
- pr_err("bad mount option arg (not int) at '%s'\n", c);
+ pr_err("bad option arg (not int) at '%s'\n", c);
return ret;
}
dout("got int token %d val %d\n", token, intval);
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 95a3b3ac9b6e..3d8a26b2944f 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -219,8 +219,7 @@ static int parse_fsopt_token(char *c, void *private)
if (token < Opt_last_int) {
ret = match_int(&argstr[0], &intval);
if (ret < 0) {
- pr_err("bad mount option arg (not int) "
- "at '%s'\n", c);
+ pr_err("bad option arg (not int) at '%s'\n", c);
return ret;
}
dout("got int token %d val %d\n", token, intval);
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 1677a6132034..6ebd7d953ee0 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -396,8 +396,7 @@ ceph_parse_options(char *options, const char *dev_name,
if (token < Opt_last_int) {
err = match_int(&argstr[0], &intval);
if (err < 0) {
- pr_err("bad mount option arg (not int) "
- "at '%s'\n", c);
+ pr_err("bad option arg (not int) at '%s'\n", c);
goto out;
}
dout("got int token %d val %d\n", token, intval);