diff options
| author | Karel Zak | 2011-01-22 00:09:34 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-01-22 00:27:26 +0100 |
| commit | 68164f6c308af1f53567b627876cd1bc8afe8817 (patch) | |
| tree | 619ba5ff92b2f6a23ce899b9f771279179a7c7ba /mount/mount.c | |
| parent | libmount: add functions for mount.<type> helpers (diff) | |
| download | kernel-qcow2-util-linux-68164f6c308af1f53567b627876cd1bc8afe8817.tar.gz kernel-qcow2-util-linux-68164f6c308af1f53567b627876cd1bc8afe8817.tar.xz kernel-qcow2-util-linux-68164f6c308af1f53567b627876cd1bc8afe8817.zip | |
libmount: cleanup API, remove typedef
- replace mnt_ with libmnt_ prefix for types (the old prefix was too generic)
- remove typedef, use struct everywhere
- use shorter functions names (s/userspace/user/; s/mountflags/mflags/)
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'mount/mount.c')
| -rw-r--r-- | mount/mount.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mount/mount.c b/mount/mount.c index d5f9e4c9c..bb4bd3476 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -88,7 +88,7 @@ static int restricted = 1; static int pfd = -1; #ifdef HAVE_LIBMOUNT_MOUNT -static mnt_update *mtab_update; +static struct libmnt_update *mtab_update; static char *mtab_opts; static unsigned long mtab_flags; @@ -1339,7 +1339,7 @@ static void prepare_mtab_entry(const char *spec, const char *node, const char *type, const char *opts, unsigned long flags) { - mnt_fs *fs = mnt_new_fs(); + struct libmnt_fs *fs = mnt_new_fs(); int rc = -1; if (!mtab_update) @@ -1372,12 +1372,12 @@ prepare_mtab_entry(const char *spec, const char *node, const char *type, static void update_mtab_entry(int flags) { unsigned long fl; - mnt_lock *lc; + struct libmnt_lock *lc; if (!mtab_update) return; - fl = mnt_update_get_mountflags(mtab_update); + fl = mnt_update_get_mflags(mtab_update); if ((flags & MS_RDONLY) != (fl & MS_RDONLY)) mnt_update_force_rdonly(mtab_update, flags & MS_RDONLY); @@ -1391,7 +1391,7 @@ static void update_mtab_entry(int flags) } lc = init_libmount_lock( mnt_update_get_filename(mtab_update) ); - mnt_update_tab(mtab_update, lc); + mnt_update_table(mtab_update, lc); init_libmount_lock(NULL); } |