diff options
| author | Karel Zak | 2011-02-22 18:41:20 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-02-22 18:41:20 +0100 |
| commit | f2b3a3a3288d56b09d878c3e2b5310268f2f4d31 (patch) | |
| tree | 4d990af02e8664a09a88bb2d110c0344a43e355a /shlibs/mount/src/context_mount.c | |
| parent | ipcs: fix typo (diff) | |
| download | kernel-qcow2-util-linux-f2b3a3a3288d56b09d878c3e2b5310268f2f4d31.tar.gz kernel-qcow2-util-linux-f2b3a3a3288d56b09d878c3e2b5310268f2f4d31.tar.xz kernel-qcow2-util-linux-f2b3a3a3288d56b09d878c3e2b5310268f2f4d31.zip | |
libmount: don't export functions for vfs/fs/userspace mount options
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/mount/src/context_mount.c')
| -rw-r--r-- | shlibs/mount/src/context_mount.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/shlibs/mount/src/context_mount.c b/shlibs/mount/src/context_mount.c index 0c6754644..647e26149 100644 --- a/shlibs/mount/src/context_mount.c +++ b/shlibs/mount/src/context_mount.c @@ -109,10 +109,14 @@ static int fix_optstr(struct libmnt_context *cxt) if (!rc && cxt->user_mountflags && MNT_MS_USER) rc = mnt_optstr_fix_user(&fs->user_optstr); + /* refresh merged optstr */ + free(fs->optstr); + fs->optstr = NULL; + fs->optstr = mnt_fs_strdup_options(fs); done: DBG(CXT, mnt_debug_h(cxt, "fixed options [rc=%d]: " - "vfs: '%s' fs: '%s' user: '%s'", rc, - fs->vfs_optstr, fs->fs_optstr, fs->user_optstr)); + "vfs: '%s' fs: '%s' user: '%s', optstr: '%s'", rc, + fs->vfs_optstr, fs->fs_optstr, fs->user_optstr, fs->optstr)); return rc; } |