libmount: use separate buffer for userspace options, add mount attributes

Signed-off-by: Karel Zak <kzak@redhat.com>

10 files changed, 98 insertions, 72 deletions

diff --git a/tests/expected/libmount/tabfiles-copy b/tests/expected/libmount/tabfiles-copy
index ff962cc82..bc4778261 100644
--- a/tests/expected/libmount/tabfiles-copy
+++ b/tests/expected/libmount/tabfiles-copy
@@ -3,7 +3,7 @@ ORIGINAL:
 source: UUID=d3a8f783-df75-4dc8-9163-975a891052c0
 target: /
 fstype: ext3
-optstr: noatime,defaults
+VFS-optstr: noatime
 freq:   1
 pass:   1
 COPY:
@@ -11,6 +11,6 @@ COPY:
 source: UUID=d3a8f783-df75-4dc8-9163-975a891052c0
 target: /
 fstype: ext3
-optstr: noatime,defaults
+VFS-optstr: noatime
 freq:   1
 pass:   1
diff --git a/tests/expected/libmount/tabfiles-find-pair b/tests/expected/libmount/tabfiles-find-pair
index 4b1134cbb..ce8f957d2 100644
--- a/tests/expected/libmount/tabfiles-find-pair
+++ b/tests/expected/libmount/tabfiles-find-pair
@@ -2,4 +2,4 @@
 source: /dev/mapper/kzak-home
 target: /home/kzak
 fstype: ext4
-optstr: rw,noatime
+VFS-optstr: rw,noatime
diff --git a/tests/expected/libmount/tabfiles-find-source b/tests/expected/libmount/tabfiles-find-source
index deebbf4cb..a49fdae25 100644
--- a/tests/expected/libmount/tabfiles-find-source
+++ b/tests/expected/libmount/tabfiles-find-source
@@ -2,6 +2,6 @@
 source: UUID=fef7ccb3-821c-4de8-88dc-71472be5946f
 target: /boot
 fstype: ext3
-optstr: noatime,defaults
+VFS-optstr: noatime
 freq:   1
 pass:   2
diff --git a/tests/expected/libmount/tabfiles-find-target b/tests/expected/libmount/tabfiles-find-target
index 8be992bcf..8d48723f8 100644
--- a/tests/expected/libmount/tabfiles-find-target
+++ b/tests/expected/libmount/tabfiles-find-target
@@ -2,4 +2,4 @@
 source: /dev/mapper/foo
 target: /home/foo
 fstype: ext4
-optstr: noatime,defaults
+VFS-optstr: noatime
diff --git a/tests/expected/libmount/tabfiles-parse-fstab b/tests/expected/libmount/tabfiles-parse-fstab
index 8d3586278..3cdcc5d45 100644
--- a/tests/expected/libmount/tabfiles-parse-fstab
+++ b/tests/expected/libmount/tabfiles-parse-fstab
@@ -2,53 +2,49 @@
 source: UUID=d3a8f783-df75-4dc8-9163-975a891052c0
 target: /
 fstype: ext3
-optstr: noatime,defaults
+VFS-optstr: noatime
 freq:   1
 pass:   1
 ------ fs:
 source: UUID=fef7ccb3-821c-4de8-88dc-71472be5946f
 target: /boot
 fstype: ext3
-optstr: noatime,defaults
+VFS-optstr: noatime
 freq:   1
 pass:   2
 ------ fs:
 source: UUID=1f2aa318-9c34-462e-8d29-260819ffd657
 target: swap
 fstype: swap
-optstr: defaults
 ------ fs:
 source: tmpfs
 target: /dev/shm
 fstype: tmpfs
-optstr: defaults
 ------ fs:
 source: devpts
 target: /dev/pts
 fstype: devpts
-optstr: gid=5,mode=620
+FS-opstr: gid=5,mode=620
 ------ fs:
 source: sysfs
 target: /sys
 fstype: sysfs
-optstr: defaults
 ------ fs:
 source: proc
 target: /proc
 fstype: proc
-optstr: defaults
 ------ fs:
 source: /dev/mapper/foo
 target: /home/foo
 fstype: ext4
-optstr: noatime,defaults
+VFS-optstr: noatime
 ------ fs:
 source: foo.com:/mnt/share
 target: /mnt/remote
 fstype: nfs
-optstr: noauto
+user-optstr: noauto
 ------ fs:
 source: //bar.com/gogogo
 target: /mnt/gogogo
 fstype: cifs
-optstr: user=SRGROUP/baby,noauto
+user-optstr: user=SRGROUP/baby,noauto
diff --git a/tests/expected/libmount/tabfiles-parse-fstab-broken b/tests/expected/libmount/tabfiles-parse-fstab-broken
index f048e440d..bf7566160 100644
--- a/tests/expected/libmount/tabfiles-parse-fstab-broken
+++ b/tests/expected/libmount/tabfiles-parse-fstab-broken
@@ -4,54 +4,50 @@
 source: UUID=d3a8f783-df75-4dc8-9163-975a891052c0
 target: /
 fstype: ext3
-optstr: noatime,defaults
+VFS-optstr: noatime
 freq:   1
 pass:   1
 ------ fs:
 source: UUID=fef7ccb3-821c-4de8-88dc-71472be5946f
 target: /boot
 fstype: ext3
-optstr: noatime,defaults
+VFS-optstr: noatime
 freq:   1
 pass:   2
 ------ fs:
 source: UUID=1f2aa318-9c34-462e-8d29-260819ffd657
 target: swap
 fstype: swap
-optstr: defaults
 ------ fs:
 source: tmpfs
 target: /dev/shm
 fstype: tmpfs
-optstr: defaults
 ------ fs:
 source: devpts
 target: /dev/pts
 fstype: devpts
-optstr: gid=5,mode=620
+FS-opstr: gid=5,mode=620
 ------ fs:
 source: sysfs
 target: /sys
 fstype: sysfs
-optstr: defaults
 ------ fs:
 source: proc
 target: /proc
 fstype: proc
-optstr: defaults
 ------ fs:
 source: /dev/mapper/foo
 target: /home/foo
 fstype: ext4
-optstr: noatime,defaults
+VFS-optstr: noatime
 freq:   1
 ------ fs:
 source: foo.com:/mnt/share
 target: /mnt/remote
 fstype: nfs
-optstr: noauto
+user-optstr: noauto
 ------ fs:
 source: //bar.com/gogogo
 target: /mnt/gogogo
 fstype: cifs
-optstr: user=SRGROUP/baby,noauto
+user-optstr: user=SRGROUP/baby,noauto
diff --git a/tests/expected/libmount/tabfiles-parse-mountinfo b/tests/expected/libmount/tabfiles-parse-mountinfo
index a2de2ae7e..aac3591e4 100644
--- a/tests/expected/libmount/tabfiles-parse-mountinfo
+++ b/tests/expected/libmount/tabfiles-parse-mountinfo
@@ -2,7 +2,8 @@
 source: /proc
 target: /proc
 fstype: proc
-optstr: rw,relatime
+VFS-optstr: rw,relatime
+FS-opstr: rw
 root:   /
 id:     15
 parent: 20
@@ -11,7 +12,8 @@ devno:  0:3
 source: /sys
 target: /sys
 fstype: sysfs
-optstr: rw,relatime
+VFS-optstr: rw,relatime
+FS-opstr: rw
 root:   /
 id:     16
 parent: 20
@@ -20,7 +22,8 @@ devno:  0:15
 source: udev
 target: /dev
 fstype: devtmpfs
-optstr: rw,relatime,size=1983516k,nr_inodes=495879,mode=755
+VFS-optstr: rw,relatime
+FS-opstr: rw,size=1983516k,nr_inodes=495879,mode=755
 root:   /
 id:     17
 parent: 20
@@ -29,7 +32,8 @@ devno:  0:5
 source: devpts
 target: /dev/pts
 fstype: devpts
-optstr: rw,relatime,gid=5,mode=620,ptmxmode=000
+VFS-optstr: rw,relatime
+FS-opstr: rw,gid=5,mode=620,ptmxmode=000
 root:   /
 id:     18
 parent: 17
@@ -38,7 +42,8 @@ devno:  0:10
 source: tmpfs
 target: /dev/shm
 fstype: tmpfs
-optstr: rw,relatime
+VFS-optstr: rw,relatime
+FS-opstr: rw
 root:   /
 id:     19
 parent: 17
@@ -47,7 +52,8 @@ devno:  0:16
 source: /dev/sda4
 target: /
 fstype: ext3
-optstr: rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
+VFS-optstr: rw,noatime
+FS-opstr: rw,errors=continue,user_xattr,acl,barrier=0,data=ordered
 root:   /
 id:     20
 parent: 1
@@ -56,7 +62,8 @@ devno:  8:4
 source: tmpfs
 target: /sys/fs/cgroup
 fstype: tmpfs
-optstr: rw,nosuid,nodev,noexec,relatime,mode=755
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,mode=755
 root:   /
 id:     21
 parent: 16
@@ -65,7 +72,8 @@ devno:  0:17
 source: cgroup
 target: /sys/fs/cgroup/systemd
 fstype: cgroup
-optstr: rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd
 root:   /
 id:     22
 parent: 21
@@ -74,7 +82,8 @@ devno:  0:18
 source: cgroup
 target: /sys/fs/cgroup/cpuset
 fstype: cgroup
-optstr: rw,nosuid,nodev,noexec,relatime,cpuset
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,cpuset
 root:   /
 id:     23
 parent: 21
@@ -83,7 +92,8 @@ devno:  0:19
 source: cgroup
 target: /sys/fs/cgroup/ns
 fstype: cgroup
-optstr: rw,nosuid,nodev,noexec,relatime,ns
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,ns
 root:   /
 id:     24
 parent: 21
@@ -92,7 +102,8 @@ devno:  0:20
 source: cgroup
 target: /sys/fs/cgroup/cpu
 fstype: cgroup
-optstr: rw,nosuid,nodev,noexec,relatime,cpu
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,cpu
 root:   /
 id:     25
 parent: 21
@@ -101,7 +112,8 @@ devno:  0:21
 source: cgroup
 target: /sys/fs/cgroup/cpuacct
 fstype: cgroup
-optstr: rw,nosuid,nodev,noexec,relatime,cpuacct
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,cpuacct
 root:   /
 id:     26
 parent: 21
@@ -110,7 +122,8 @@ devno:  0:22
 source: cgroup
 target: /sys/fs/cgroup/memory
 fstype: cgroup
-optstr: rw,nosuid,nodev,noexec,relatime,memory
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,memory
 root:   /
 id:     27
 parent: 21
@@ -119,7 +132,8 @@ devno:  0:23
 source: cgroup
 target: /sys/fs/cgroup/devices
 fstype: cgroup
-optstr: rw,nosuid,nodev,noexec,relatime,devices
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,devices
 root:   /
 id:     28
 parent: 21
@@ -128,7 +142,8 @@ devno:  0:24
 source: cgroup
 target: /sys/fs/cgroup/freezer
 fstype: cgroup
-optstr: rw,nosuid,nodev,noexec,relatime,freezer
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,freezer
 root:   /
 id:     29
 parent: 21
@@ -137,7 +152,8 @@ devno:  0:25
 source: cgroup
 target: /sys/fs/cgroup/net_cls
 fstype: cgroup
-optstr: rw,nosuid,nodev,noexec,relatime,net_cls
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,net_cls
 root:   /
 id:     30
 parent: 21
@@ -146,7 +162,8 @@ devno:  0:26
 source: cgroup
 target: /sys/fs/cgroup/blkio
 fstype: cgroup
-optstr: rw,nosuid,nodev,noexec,relatime,blkio
+VFS-optstr: rw,nosuid,nodev,noexec,relatime
+FS-opstr: rw,blkio
 root:   /
 id:     31
 parent: 21
@@ -155,7 +172,8 @@ devno:  0:27
 source: systemd-1
 target: /sys/kernel/security
 fstype: autofs
-optstr: rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
+VFS-optstr: rw,relatime
+FS-opstr: rw,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 root:   /
 id:     32
 parent: 16
@@ -164,7 +182,8 @@ devno:  0:28
 source: systemd-1
 target: /dev/hugepages
 fstype: autofs
-optstr: rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
+VFS-optstr: rw,relatime
+FS-opstr: rw,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 root:   /
 id:     33
 parent: 17
@@ -173,7 +192,8 @@ devno:  0:29
 source: systemd-1
 target: /sys/kernel/debug
 fstype: autofs
-optstr: rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
+VFS-optstr: rw,relatime
+FS-opstr: rw,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 root:   /
 id:     34
 parent: 16
@@ -182,7 +202,8 @@ devno:  0:30
 source: systemd-1
 target: /proc/sys/fs/binfmt_misc
 fstype: autofs
-optstr: rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
+VFS-optstr: rw,relatime
+FS-opstr: rw,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 root:   /
 id:     35
 parent: 15
@@ -191,7 +212,8 @@ devno:  0:31
 source: systemd-1
 target: /dev/mqueue
 fstype: autofs
-optstr: rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
+VFS-optstr: rw,relatime
+FS-opstr: rw,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 root:   /
 id:     36
 parent: 17
@@ -200,7 +222,8 @@ devno:  0:32
 source: /proc/bus/usb
 target: /proc/bus/usb
 fstype: usbfs
-optstr: rw,relatime
+VFS-optstr: rw,relatime
+FS-opstr: rw
 root:   /
 id:     37
 parent: 15
@@ -209,7 +232,8 @@ devno:  0:14
 source: hugetlbfs
 target: /dev/hugepages
 fstype: hugetlbfs
-optstr: rw,relatime
+VFS-optstr: rw,relatime
+FS-opstr: rw
 root:   /
 id:     38
 parent: 33
@@ -218,7 +242,8 @@ devno:  0:33
 source: mqueue
 target: /dev/mqueue
 fstype: mqueue
-optstr: rw,relatime
+VFS-optstr: rw,relatime
+FS-opstr: rw
 root:   /
 id:     39
 parent: 36
@@ -227,7 +252,8 @@ devno:  0:12
 source: /dev/sda6
 target: /boot
 fstype: ext3
-optstr: rw,noatime,errors=continue,barrier=0,data=ordered
+VFS-optstr: rw,noatime
+FS-opstr: rw,errors=continue,barrier=0,data=ordered
 root:   /
 id:     40
 parent: 20
@@ -236,7 +262,8 @@ devno:  8:6
 source: /dev/mapper/kzak-home
 target: /home/kzak
 fstype: ext4
-optstr: rw,noatime,barrier=1,data=ordered
+VFS-optstr: rw,noatime
+FS-opstr: rw,barrier=1,data=ordered
 root:   /
 id:     41
 parent: 20
@@ -245,7 +272,8 @@ devno:  253:0
 source: (null)
 target: /proc/sys/fs/binfmt_misc
 fstype: binfmt_misc
-optstr: rw,relatime
+VFS-optstr: rw,relatime
+FS-opstr: rw
 root:   /
 id:     42
 parent: 35
@@ -254,7 +282,8 @@ devno:  0:34
 source: fusectl
 target: /sys/fs/fuse/connections
 fstype: fusectl
-optstr: rw,relatime
+VFS-optstr: rw,relatime
+FS-opstr: rw
 root:   /
 id:     43
 parent: 16
@@ -263,7 +292,8 @@ devno:  0:35
 source: gvfs-fuse-daemon
 target: /home/kzak/.gvfs
 fstype: fuse.gvfs-fuse-daemon
-optstr: rw,nosuid,nodev,relatime,user_id=500,group_id=500
+VFS-optstr: rw,nosuid,nodev,relatime
+FS-opstr: rw,user_id=500,group_id=500
 root:   /
 id:     44
 parent: 41
@@ -272,7 +302,8 @@ devno:  0:36
 source: sunrpc
 target: /var/lib/nfs/rpc_pipefs
 fstype: rpc_pipefs
-optstr: rw,relatime
+VFS-optstr: rw,relatime
+FS-opstr: rw
 root:   /
 id:     45
 parent: 20
@@ -281,7 +312,8 @@ devno:  0:37
 source: //foo.home/bar/
 target: /mnt/sounds
 fstype: cifs
-optstr: rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
+VFS-optstr: rw,relatime
+FS-opstr: rw,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
 root:   /
 id:     47
 parent: 20
diff --git a/tests/expected/libmount/tabfiles-parse-mtab b/tests/expected/libmount/tabfiles-parse-mtab
index b8ea0cfd8..9838a9cd9 100644
--- a/tests/expected/libmount/tabfiles-parse-mtab
+++ b/tests/expected/libmount/tabfiles-parse-mtab
@@ -2,54 +2,56 @@
 source: /dev/sda4
 target: /
 fstype: ext3
-optstr: rw,noatime
+VFS-optstr: rw,noatime
 ------ fs:
 source: proc
 target: /proc
 fstype: proc
-optstr: rw
+VFS-optstr: rw
 ------ fs:
 source: sysfs
 target: /sys
 fstype: sysfs
-optstr: rw
+VFS-optstr: rw
 ------ fs:
 source: devpts
 target: /dev/pts
 fstype: devpts
-optstr: rw,gid=5,mode=620
+VFS-optstr: rw
+FS-opstr: gid=5,mode=620
 ------ fs:
 source: tmpfs
 target: /dev/shm
 fstype: tmpfs
-optstr: rw
+VFS-optstr: rw
 ------ fs:
 source: /dev/sda6
 target: /boot
 fstype: ext3
-optstr: rw,noatime
+VFS-optstr: rw,noatime
 ------ fs:
 source: /dev/mapper/kzak-home
 target: /home/kzak
 fstype: ext4
-optstr: rw,noatime
+VFS-optstr: rw,noatime
 ------ fs:
 source: (null)
 target: /proc/sys/fs/binfmt_misc
 fstype: binfmt_misc
-optstr: rw
+VFS-optstr: rw
 ------ fs:
 source: fusectl
 target: /sys/fs/fuse/connections
 fstype: fusectl
-optstr: rw
+VFS-optstr: rw
 ------ fs:
 source: gvfs-fuse-daemon
 target: /home/kzak/.gvfs
 fstype: fuse.gvfs-fuse-daemon
-optstr: rw,nosuid,nodev,user=kzak
+VFS-optstr: rw,nosuid,nodev
+user-optstr: user=kzak
 ------ fs:
 source: sunrpc
 target: /var/lib/nfs/rpc_pipefs
 fstype: rpc_pipefs
-optstr: rw
+VFS-optstr: rw
diff --git a/tests/expected/libmount/update-mtab-mount b/tests/expected/libmount/update-mtab-mount
index 6744e8c0e..271d86bc7 100644
--- a/tests/expected/libmount/update-mtab-mount
+++ b/tests/expected/libmount/update-mtab-mount
@@ -1,4 +1,4 @@
-/dev/sda1 /mnt/foo ext3 rw,bbb,ccc,fff=FFF,ddd,noexec 0 0
-/dev/sdb1 /mnt/bar ext3 gg=G,ffff=f,ro,noatime 0 0
+/dev/sda1 /mnt/foo ext3 rw,noexec,bbb,ccc,fff=FFF,ddd 0 0
+/dev/sdb1 /mnt/bar ext3 ro,noatime,gg=G,ffff=f 0 0
 /dev/sda2 /mnt/bar ext3 rw,noatime 0 0
 /dev/sda1 /mnt/gogo ext3 rw,noatime,nosuid 0 0
diff --git a/tests/expected/libmount/update-mtab-move b/tests/expected/libmount/update-mtab-move
index 6c6ec6661..c6dffdbeb 100644
--- a/tests/expected/libmount/update-mtab-move
+++ b/tests/expected/libmount/update-mtab-move
@@ -1,4 +1,4 @@
-/dev/sda1 /mnt/newfoo ext3 rw,bbb,ccc,fff=FFF,ddd,noexec 0 0
-/dev/sdb1 /mnt/bar ext3 gg=G,ffff=f,ro,noatime 0 0
+/dev/sda1 /mnt/newfoo ext3 rw,noexec,bbb,ccc,fff=FFF,ddd 0 0
+/dev/sdb1 /mnt/bar ext3 ro,noatime,gg=G,ffff=f 0 0
 /dev/sda2 /mnt/newbar ext3 rw,noatime 0 0
 /dev/sda1 /mnt/gogo ext3 rw,noatime,nosuid 0 0