* [PATCH] mount: fix for libmount from util-linux >= 2.20
@ 2011-08-03 12:36 Karel Zak
2011-08-03 19:14 ` Steve Dickson
0 siblings, 1 reply; 2+ messages in thread
From: Karel Zak @ 2011-08-03 12:36 UTC (permalink / raw)
To: Steve Dickson; +Cc: linux-nfs, Karel Zak
The function mnt_fs_set_fs_options() has been removed from the final
version of the libmount API.
Signed-off-by: Karel Zak <kzak@redhat.com>
---
utils/mount/mount_libmount.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/utils/mount/mount_libmount.c b/utils/mount/mount_libmount.c
index 6dd6484..cf6e58c 100644
--- a/utils/mount/mount_libmount.c
+++ b/utils/mount/mount_libmount.c
@@ -61,10 +61,19 @@ int nomtab;
* managed by libmount at all. We have to use "mount attributes" that are
* private for mount.<type> helpers.
*/
-static void store_mount_options(struct libmnt_fs *fs, const char *opts)
+static void store_mount_options(struct libmnt_fs *fs, const char *nfs_opts)
{
- mnt_fs_set_fs_options(fs, opts); /* for mtab */
- mnt_fs_set_attributes(fs, opts); /* for non-mtab systems */
+ char *o = NULL;
+
+ mnt_fs_set_attributes(fs, nfs_opts); /* for non-mtab systems */
+
+ /* for mtab create a new options list */
+ mnt_optstr_append_option(&o, mnt_fs_get_vfs_options(fs), NULL);
+ mnt_optstr_append_option(&o, nfs_opts, NULL);
+ mnt_optstr_append_option(&o, mnt_fs_get_user_options(fs), NULL);
+
+ mnt_fs_set_options(fs, o);
+ free(o);
}
/*
--
1.7.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mount: fix for libmount from util-linux >= 2.20
2011-08-03 12:36 [PATCH] mount: fix for libmount from util-linux >= 2.20 Karel Zak
@ 2011-08-03 19:14 ` Steve Dickson
0 siblings, 0 replies; 2+ messages in thread
From: Steve Dickson @ 2011-08-03 19:14 UTC (permalink / raw)
To: Karel Zak; +Cc: linux-nfs
On 08/03/2011 08:36 AM, Karel Zak wrote:
> The function mnt_fs_set_fs_options() has been removed from the final
> version of the libmount API.
>
> Signed-off-by: Karel Zak <kzak@redhat.com>
Committed...
steved.
> ---
> utils/mount/mount_libmount.c | 15 ++++++++++++---
> 1 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/utils/mount/mount_libmount.c b/utils/mount/mount_libmount.c
> index 6dd6484..cf6e58c 100644
> --- a/utils/mount/mount_libmount.c
> +++ b/utils/mount/mount_libmount.c
> @@ -61,10 +61,19 @@ int nomtab;
> * managed by libmount at all. We have to use "mount attributes" that are
> * private for mount.<type> helpers.
> */
> -static void store_mount_options(struct libmnt_fs *fs, const char *opts)
> +static void store_mount_options(struct libmnt_fs *fs, const char *nfs_opts)
> {
> - mnt_fs_set_fs_options(fs, opts); /* for mtab */
> - mnt_fs_set_attributes(fs, opts); /* for non-mtab systems */
> + char *o = NULL;
> +
> + mnt_fs_set_attributes(fs, nfs_opts); /* for non-mtab systems */
> +
> + /* for mtab create a new options list */
> + mnt_optstr_append_option(&o, mnt_fs_get_vfs_options(fs), NULL);
> + mnt_optstr_append_option(&o, nfs_opts, NULL);
> + mnt_optstr_append_option(&o, mnt_fs_get_user_options(fs), NULL);
> +
> + mnt_fs_set_options(fs, o);
> + free(o);
> }
>
> /*
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-03 19:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-03 12:36 [PATCH] mount: fix for libmount from util-linux >= 2.20 Karel Zak
2011-08-03 19:14 ` Steve Dickson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).