diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-04 11:48:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-11-04 11:48:08 +0100 |
| commit | 99e18df3a41a044c6ac83e5e8310c228221881c9 (patch) | |
| tree | 03aee44088bc0761e2bf2bb3985d64903ed3a4c5 /fs/dax.c | |
| parent | a1bb46c36ce389d4a24a42e5b6047b0626caa3ea (diff) | |
| parent | db0d32d84031188443e25edbd50a71a6e7ac5d1d (diff) | |
| download | talos-op-linux-99e18df3a41a044c6ac83e5e8310c228221881c9.tar.gz talos-op-linux-99e18df3a41a044c6ac83e5e8310c228221881c9.zip | |
Merge back earlier cpufreq material for v5.5.
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); |
