diff options
author | Matthew Wilcox <willy@infradead.org> | 2019-02-06 13:07:11 -0500 |
---|---|---|
committer | Matthew Wilcox <willy@infradead.org> | 2019-02-06 13:12:15 -0500 |
commit | fd9dc93e36231fb6d520e0edd467058fad4fd12d (patch) | |
tree | aa7dc07e911ece5d69304e9e4bba1f9b937d8ce2 /lib/test_xarray.c | |
parent | 809ab9371ca0a96b44d9866ad82849410759a45b (diff) |
XArray: Change xa_insert to return -EBUSY
Userspace translates EEXIST to "File exists" which isn't a very good
error message for the problem. "Device or resource busy" is a better
indication of what went wrong.
Signed-off-by: Matthew Wilcox <willy@infradead.org>
Diffstat (limited to 'lib/test_xarray.c')
-rw-r--r-- | lib/test_xarray.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/test_xarray.c b/lib/test_xarray.c index 671a93ee09e6..9d894e93456c 100644 --- a/lib/test_xarray.c +++ b/lib/test_xarray.c | |||
@@ -346,7 +346,7 @@ static noinline void check_cmpxchg(struct xarray *xa) | |||
346 | 346 | ||
347 | XA_BUG_ON(xa, !xa_empty(xa)); | 347 | XA_BUG_ON(xa, !xa_empty(xa)); |
348 | XA_BUG_ON(xa, xa_store_index(xa, 12345678, GFP_KERNEL) != NULL); | 348 | XA_BUG_ON(xa, xa_store_index(xa, 12345678, GFP_KERNEL) != NULL); |
349 | XA_BUG_ON(xa, xa_insert(xa, 12345678, xa, GFP_KERNEL) != -EEXIST); | 349 | XA_BUG_ON(xa, xa_insert(xa, 12345678, xa, GFP_KERNEL) != -EBUSY); |
350 | XA_BUG_ON(xa, xa_cmpxchg(xa, 12345678, SIX, FIVE, GFP_KERNEL) != LOTS); | 350 | XA_BUG_ON(xa, xa_cmpxchg(xa, 12345678, SIX, FIVE, GFP_KERNEL) != LOTS); |
351 | XA_BUG_ON(xa, xa_cmpxchg(xa, 12345678, LOTS, FIVE, GFP_KERNEL) != LOTS); | 351 | XA_BUG_ON(xa, xa_cmpxchg(xa, 12345678, LOTS, FIVE, GFP_KERNEL) != LOTS); |
352 | XA_BUG_ON(xa, xa_cmpxchg(xa, 12345678, FIVE, LOTS, GFP_KERNEL) != FIVE); | 352 | XA_BUG_ON(xa, xa_cmpxchg(xa, 12345678, FIVE, LOTS, GFP_KERNEL) != FIVE); |
@@ -388,7 +388,7 @@ static noinline void check_reserve(struct xarray *xa) | |||
388 | /* But xa_insert does not */ | 388 | /* But xa_insert does not */ |
389 | xa_reserve(xa, 12345678, GFP_KERNEL); | 389 | xa_reserve(xa, 12345678, GFP_KERNEL); |
390 | XA_BUG_ON(xa, xa_insert(xa, 12345678, xa_mk_value(12345678), 0) != | 390 | XA_BUG_ON(xa, xa_insert(xa, 12345678, xa_mk_value(12345678), 0) != |
391 | -EEXIST); | 391 | -EBUSY); |
392 | XA_BUG_ON(xa, xa_empty(xa)); | 392 | XA_BUG_ON(xa, xa_empty(xa)); |
393 | XA_BUG_ON(xa, xa_erase(xa, 12345678) != NULL); | 393 | XA_BUG_ON(xa, xa_erase(xa, 12345678) != NULL); |
394 | XA_BUG_ON(xa, !xa_empty(xa)); | 394 | XA_BUG_ON(xa, !xa_empty(xa)); |