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/tab_parse.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/tab_parse.c')
| -rw-r--r-- | shlibs/mount/src/tab_parse.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c index 4eb32eb63..cd4e34897 100644 --- a/shlibs/mount/src/tab_parse.c +++ b/shlibs/mount/src/tab_parse.c @@ -163,6 +163,11 @@ static int mnt_parse_mountinfo_line(struct libmnt_fs *fs, char *s) rc = __mnt_fs_set_fstype_ptr(fs, fstype); if (!rc) rc = __mnt_fs_set_source_ptr(fs, src); + + /* merge VFS and FS options to the one string */ + fs->optstr = mnt_fs_strdup_options(fs); + if (!fs->optstr) + rc = -ENOMEM; } else { DBG(TAB, mnt_debug( "mountinfo parse error [sscanf rc=%d]: '%s'", rc, s)); @@ -651,7 +656,7 @@ static struct libmnt_fs *mnt_table_merge_user_fs(struct libmnt_table *tb, struct if (fs) { DBG(TAB, mnt_debug_h(tb, "found fs -- appending user optstr")); - mnt_fs_append_user_options(fs, optstr); + mnt_fs_append_options(fs, optstr); mnt_fs_append_attributes(fs, attrs); mnt_fs_set_bindsrc(fs, mnt_fs_get_bindsrc(uf)); fs->flags |= MNT_FS_MERGED; |