summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2018-06-27 10:38:13 -0400
committerIlya Dryomov <idryomov@gmail.com>2018-08-02 15:26:11 -0400
commit2f56b6bae73b2d65ef4816ca89341facc53d3361 (patch)
tree30c4eb51affe028036234b4a3b21614b0fab647c
parent17173c82e3daa28742bf7732520e9bc2e0cb977d (diff)
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)
786 if (token < Opt_last_int) { 786 if (token < Opt_last_int) {
787 ret = match_int(&argstr[0], &intval); 787 ret = match_int(&argstr[0], &intval);
788 if (ret < 0) { 788 if (ret < 0) {
789 pr_err("bad mount option arg (not int) at '%s'\n", c); 789 pr_err("bad option arg (not int) at '%s'\n", c);
790 return ret; 790 return ret;
791 } 791 }
792 dout("got int token %d val %d\n", token, intval); 792 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)
219 if (token < Opt_last_int) { 219 if (token < Opt_last_int) {
220 ret = match_int(&argstr[0], &intval); 220 ret = match_int(&argstr[0], &intval);
221 if (ret < 0) { 221 if (ret < 0) {
222 pr_err("bad mount option arg (not int) " 222 pr_err("bad option arg (not int) at '%s'\n", c);
223 "at '%s'\n", c);
224 return ret; 223 return ret;
225 } 224 }
226 dout("got int token %d val %d\n", token, intval); 225 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,
396 if (token < Opt_last_int) { 396 if (token < Opt_last_int) {
397 err = match_int(&argstr[0], &intval); 397 err = match_int(&argstr[0], &intval);
398 if (err < 0) { 398 if (err < 0) {
399 pr_err("bad mount option arg (not int) " 399 pr_err("bad option arg (not int) at '%s'\n", c);
400 "at '%s'\n", c);
401 goto out; 400 goto out;
402 } 401 }
403 dout("got int token %d val %d\n", token, intval); 402 dout("got int token %d val %d\n", token, intval);