From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:63599 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754568Ab1HCTOL (ORCPT ); Wed, 3 Aug 2011 15:14:11 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p73JEBLs000985 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 3 Aug 2011 15:14:11 -0400 Message-ID: <4E399E02.4010702@RedHat.com> Date: Wed, 03 Aug 2011 15:14:10 -0400 From: Steve Dickson To: Karel Zak CC: linux-nfs@vger.kernel.org Subject: Re: [PATCH] mount: fix for libmount from util-linux >= 2.20 References: <1312374969-15726-1-git-send-email-kzak@redhat.com> In-Reply-To: <1312374969-15726-1-git-send-email-kzak@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-nfs-owner@vger.kernel.org List-ID: MIME-Version: 1.0 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 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. 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); > } > > /*