diff options
| author | Tim Hildering | 2019-03-04 19:15:08 +0100 |
|---|---|---|
| committer | Karel Zak | 2019-03-08 11:40:20 +0100 |
| commit | 9d5eb4c46405413a8dd69d01f4e094f4390944d1 (patch) | |
| tree | c367420b5f2821714ae1eaf8bbde261f2825e6a9 /libmount/src/tab.c | |
| parent | su: add note about ECHO on --pty (diff) | |
| download | kernel-qcow2-util-linux-9d5eb4c46405413a8dd69d01f4e094f4390944d1.tar.gz kernel-qcow2-util-linux-9d5eb4c46405413a8dd69d01f4e094f4390944d1.tar.xz kernel-qcow2-util-linux-9d5eb4c46405413a8dd69d01f4e094f4390944d1.zip | |
libmount: improve fs referencing in tables
* Added member 'struct libmnt_table *tab' to libmnt_fs structure.
* Added 'mnt_fs_get_table()'.
* Removed overhead from 'mnt_table_{insert,move,remove}_fs().
* Added check to 'mnt_table_set_iter()' that entry is member of table.
[kzak@redhat.com: - add to libmount.sys
- add to docs
- cleanup commit message
- set fs->tab = NULL before mnt_unref_fs() in mnt_table_remove_fs()]
Signed-off-by: Tim Hildering <hilderingt@posteo.net>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src/tab.c')
| -rw-r--r-- | libmount/src/tab.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libmount/src/tab.c b/libmount/src/tab.c index 674dc67e5..6d2fdc0d5 100644 --- a/libmount/src/tab.c +++ b/libmount/src/tab.c @@ -443,11 +443,12 @@ int mnt_table_add_fs(struct libmnt_table *tb, struct libmnt_fs *fs) if (!tb || !fs) return -EINVAL; - if (!list_empty(&fs->ents)) + if (fs->tab) return -EBUSY; mnt_ref_fs(fs); list_add_tail(&fs->ents, &tb->ents); + fs->tab = tb; tb->nents++; DBG(TAB, ul_debugobj(tb, "add entry: %s %s", @@ -466,6 +467,7 @@ static int __table_insert_fs( else list_add_tail(&fs->ents, head); + fs->tab = tb; tb->nents++; DBG(TAB, ul_debugobj(tb, "insert entry: %s %s", @@ -487,7 +489,6 @@ static int __table_insert_fs( * This function inncrements reference to @fs. Don't forget to use * mnt_unref_fs() after mnt_table_insert_fs() if you want to keep the @fs * referenced by the table only. - * * Returns: 0 on success or negative number in case of error. */ @@ -497,10 +498,10 @@ int mnt_table_insert_fs(struct libmnt_table *tb, int before, if (!tb || !fs) return -EINVAL; - if (!list_empty(&fs->ents)) + if (fs->tab) return -EBUSY; - if (pos && mnt_table_find_fs(tb, pos) < 1) + if (pos && pos->tab != tb) return -ENOENT; mnt_ref_fs(fs); @@ -529,10 +530,7 @@ int mnt_table_move_fs(struct libmnt_table *src, struct libmnt_table *dst, if (!src || !dst || !fs) return -EINVAL; - if (mnt_table_find_fs(src, fs) < 1) - return -ENOENT; - - if (pos && mnt_table_find_fs(dst, pos) < 1) + if (fs->tab != src || (pos && pos->tab != dst)) return -ENOENT; /* remove from source */ @@ -557,9 +555,10 @@ int mnt_table_move_fs(struct libmnt_table *src, struct libmnt_table *dst, */ int mnt_table_remove_fs(struct libmnt_table *tb, struct libmnt_fs *fs) { - if (!tb || !fs || mnt_table_find_fs(tb, fs) < 1) + if (!tb || !fs || fs->tab != tb) return -EINVAL; + fs->tab = NULL; list_del_init(&fs->ents); mnt_unref_fs(fs); @@ -913,6 +912,9 @@ int mnt_table_set_iter(struct libmnt_table *tb, struct libmnt_iter *itr, struct if (!tb || !itr || !fs) return -EINVAL; + if (fs->tab != tb) + return -ENOENT; + MNT_ITER_INIT(itr, &tb->ents); itr->p = &fs->ents; |