Browse Source

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>
Ilya Dryomov 7 years ago
parent
commit
2f56b6bae7
3 changed files with 3 additions and 5 deletions
  1. 1 1
      drivers/block/rbd.c
  2. 1 2
      fs/ceph/super.c
  3. 1 2
      net/ceph/ceph_common.c

+ 1 - 1
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);

+ 1 - 2
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);

+ 1 - 2
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);