diff options
| -rw-r--r-- | libmount/src/context_umount.c | 4 | ||||
| -rw-r--r-- | libmount/src/fs.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c index e10af52f2..184a51efe 100644 --- a/libmount/src/context_umount.c +++ b/libmount/src/context_umount.c @@ -163,7 +163,7 @@ static int prepare_helper_from_options(struct libmnt_context *cxt, if (!opts) return 0; - if (mnt_optstr_get_option((char *) opts, name, &suffix, &valsz)) + if (mnt_optstr_get_option(opts, name, &suffix, &valsz)) return 0; suffix = strndup(suffix, valsz); @@ -305,7 +305,7 @@ static int evaluate_permissions(struct libmnt_context *cxt) /* get options from mtab */ optstr = mnt_fs_get_user_options(cxt->fs); - if (optstr && !mnt_optstr_get_option((char *) optstr, + if (optstr && !mnt_optstr_get_option(optstr, "user", &mtab_user, &sz) && sz) ok = !strncmp(curr_user, mtab_user, sz); } diff --git a/libmount/src/fs.c b/libmount/src/fs.c index dc6009cf9..86b2423eb 100644 --- a/libmount/src/fs.c +++ b/libmount/src/fs.c @@ -486,6 +486,7 @@ int __mnt_fs_set_fstype_ptr(struct libmnt_fs *fs, char *fstype) fs->fstype = fstype; fs->flags &= ~MNT_FS_PSEUDO; fs->flags &= ~MNT_FS_NET; + fs->flags &= ~MNT_FS_SWAP; /* save info about pseudo filesystems */ if (fs->fstype) { |