diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 08:40:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 08:40:15 +0200 |
| commit | 1b5a5f59e3435337bede67b9255bbb1d39fc4827 (patch) | |
| tree | c604f571dcc7bb26dfe5498eb920873248639c62 /fs/cachefiles/namei.c | |
| parent | b11445f830df0ec9271f39bff19ecc6f8db58eb8 (diff) | |
| parent | d5d962265d99088ce96480db3e61358d7170e24c (diff) | |
| download | op-kernel-dev-1b5a5f59e3435337bede67b9255bbb1d39fc4827.zip op-kernel-dev-1b5a5f59e3435337bede67b9255bbb1d39fc4827.tar.gz | |
Merge tag 'fscache-fixes-20141013' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
Pull fs-cache fixes from David Howells:
"Two fixes for bugs in CacheFiles and a cleanup in FS-Cache"
* tag 'fscache-fixes-20141013' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
fs/fscache/object-list.c: use __seq_open_private()
CacheFiles: Fix incorrect test for in-memory object collision
CacheFiles: Handle object being killed before being set up
Diffstat (limited to 'fs/cachefiles/namei.c')
| -rw-r--r-- | fs/cachefiles/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c index dad7d95..e12f189 100644 --- a/fs/cachefiles/namei.c +++ b/fs/cachefiles/namei.c @@ -189,7 +189,7 @@ try_again: /* an old object from a previous incarnation is hogging the slot - we * need to wait for it to be destroyed */ wait_for_old_object: - if (fscache_object_is_live(&object->fscache)) { + if (fscache_object_is_live(&xobject->fscache)) { pr_err("\n"); pr_err("Error: Unexpected object collision\n"); cachefiles_printk_object(object, xobject); |
