summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMatthew Wilcox <willy@infradead.org>2018-11-05 21:48:49 +0100
committerMatthew Wilcox <willy@infradead.org>2018-11-05 22:38:09 +0100
commit9c16bb88905456a9b1299338041f05fa7699971b (patch)
tree9396efce15dc79286b590c5740397f7f2bcc13c1 /lib
parentXArray: Unify xa_cmpxchg and __xa_cmpxchg (diff)
downloadlinux-9c16bb88905456a9b1299338041f05fa7699971b.tar.xz
linux-9c16bb88905456a9b1299338041f05fa7699971b.zip
XArray: Turn xa_erase into an exported function
Make xa_erase() take the spinlock and then call __xa_erase(), but make it out of line since it's such a common function. Signed-off-by: Matthew Wilcox <willy@infradead.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/xarray.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/lib/xarray.c b/lib/xarray.c
index 77671d4a7910..b55aa8c1c20f 100644
--- a/lib/xarray.c
+++ b/lib/xarray.c
@@ -1337,6 +1337,30 @@ void *__xa_erase(struct xarray *xa, unsigned long index)
EXPORT_SYMBOL(__xa_erase);
/**
+ * xa_erase() - Erase this entry from the XArray.
+ * @xa: XArray.
+ * @index: Index of entry.
+ *
+ * This function is the equivalent of calling xa_store() with %NULL as
+ * the third argument. The XArray does not need to allocate memory, so
+ * the user does not need to provide GFP flags.
+ *
+ * Context: Any context. Takes and releases the xa_lock.
+ * Return: The entry which used to be at this index.
+ */
+void *xa_erase(struct xarray *xa, unsigned long index)
+{
+ void *entry;
+
+ xa_lock(xa);
+ entry = __xa_erase(xa, index);
+ xa_unlock(xa);
+
+ return entry;
+}
+EXPORT_SYMBOL(xa_erase);
+
+/**
* xa_store() - Store this entry in the XArray.
* @xa: XArray.
* @index: Index into array.