ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libmount: add MNT_ERR_MOUNTOPT 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-05-28 12:49:55 +02:00
parent 10389b1e45
commit 61f5ff6cb4
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmount/src/context_loopdev.c
View File

@ -181,8 +181,10 @@ int mnt_context_setup_loopdev(struct libmnt_context *cxt)
if (rc == 0 && (cxt->user_mountflags & MNT_MS_OFFSET) &&
mnt_optstr_get_option(optstr, "offset", &val, &len) == 0) {
rc = mnt_parse_offset(val, len, &offset);
if (rc)
if (rc) {
DBG(CXT, mnt_debug_h(cxt, "failed to parse offset="));
rc = -MNT_ERR_MOUNTOPT;
}
}
/*
@ -191,8 +193,10 @@ int mnt_context_setup_loopdev(struct libmnt_context *cxt)
if (rc == 0 && (cxt->user_mountflags & MNT_MS_SIZELIMIT) &&
mnt_optstr_get_option(optstr, "sizelimit", &val, &len) == 0) {
rc = mnt_parse_offset(val, len, &sizelimit);
if (rc)
if (rc) {
DBG(CXT, mnt_debug_h(cxt, "failed to parse sizelimit="));
rc = -MNT_ERR_MOUNTOPT;
}
}
/*

3
libmount/src/context_mount.c
View File

@ -141,6 +141,9 @@ done:
DBG(CXT, mnt_debug_h(cxt, "fixed options [rc=%d]: "
"vfs: '%s' fs: '%s' user: '%s', optstr: '%s'", rc,
fs->vfs_optstr, fs->fs_optstr, fs->user_optstr, fs->optstr));
if (rc)
rc = -MNT_ERR_MOUNTOPT;
return rc;
}

1
libmount/src/libmount.h.in
View File

@ -127,6 +127,7 @@ enum {
#define MNT_ERR_NOFSTYPE 5001 /* failed to detect filesystem type */
#define MNT_ERR_NOSOURCE 5002 /* required mount source undefined */
#define MNT_ERR_LOOPDEV 5003 /* loopdev setup failed, errno set by libc */
#define MNT_ERR_MOUNTOPT 5004 /* failed to parse/use userspace mount options */
/* init.c */
extern void mnt_init_debug(int mask);

2
libmount/src/utils.c
View File

@ -539,6 +539,7 @@ int mnt_get_uid(const char *username, uid_t *uid)
} else {
DBG(UTILS, mnt_debug(
"cannot convert '%s' username to UID", username));
rc = errno ? -errno : -EINVAL;
}
free(buf);
@ -566,6 +567,7 @@ int mnt_get_gid(const char *groupname, gid_t *gid)
} else {
DBG(UTILS, mnt_debug(
"cannot convert '%s' groupname to GID", groupname));
rc = errno ? -errno : -EINVAL;
}
free(buf);

6
sys-utils/mount.c
View File

@ -367,6 +367,12 @@ try_readonly:
else
warnx(_("mount source not defined"));
return MOUNT_EX_USAGE;
case -MNT_ERR_MOUNTOPT:
if (errno)
warn(_("failed to parse mount options"));
else
warnx(_("failed to parse mount options"));
return MOUNT_EX_USAGE;
case -MNT_ERR_LOOPDEV:
if (errno == ENOENT
&& (uflags & MNT_MS_ENCRYPTION)