diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2019-11-13 23:10:52 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2019-11-13 23:10:52 +0100 |
commit | 1566a6a30bf4d85849bab7e389392d6d3de1530e (patch) | |
tree | bbc979f430cb07d41f7b35524027e25e7a4b9fe6 /fs/dax.c | |
parent | dt-bindings: pinctrl: Convert generic pin mux and config properties to schema (diff) | |
parent | Linux 5.4-rc5 (diff) | |
download | linux-dev-1566a6a30bf4d85849bab7e389392d6d3de1530e.tar.xz linux-dev-1566a6a30bf4d85849bab7e389392d6d3de1530e.zip |
Merge tag 'v5.4-rc5' into devel
Linux 5.4-rc5
Diffstat (limited to 'fs/dax.c')
-rw-r--r-- | fs/dax.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -220,10 +220,11 @@ static void *get_unlocked_entry(struct xa_state *xas, unsigned int order) for (;;) { entry = xas_find_conflict(xas); + if (!entry || WARN_ON_ONCE(!xa_is_value(entry))) + return entry; if (dax_entry_order(entry) < order) return XA_RETRY_ENTRY; - if (!entry || WARN_ON_ONCE(!xa_is_value(entry)) || - !dax_is_locked(entry)) + if (!dax_is_locked(entry)) return entry; wq = dax_entry_waitqueue(xas, entry, &ewait.key); |