diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-19 17:49:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-19 17:49:46 +0200 |
| commit | a90c6ac2b5651b1f907de512c2fa648c9fa6bb6e (patch) | |
| tree | bf9d9d2a1aae7c2702a81b45e930b2aa5963778f /fs | |
| parent | Merge tag 'md/4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
| parent | libceph: potential NULL dereference in ceph_msg_data_create() (diff) | |
| download | linux-a90c6ac2b5651b1f907de512c2fa648c9fa6bb6e.tar.xz linux-a90c6ac2b5651b1f907de512c2fa648c9fa6bb6e.zip | |
Merge tag 'ceph-for-4.13-rc2' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"A number of small fixes for -rc1 Luminous changes plus a readdir race
fix, marked for stable"
* tag 'ceph-for-4.13-rc2' of git://github.com/ceph/ceph-client:
libceph: potential NULL dereference in ceph_msg_data_create()
ceph: fix race in concurrent readdir
libceph: don't call encode_request_finish() on MOSDBackoff messages
libceph: use alloc_pg_mapping() in __decode_pg_upmap_items()
libceph: set -EINVAL in one place in crush_decode()
libceph: NULL deref on osdmap_apply_incremental() error path
libceph: fix old style declaration warnings
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/dir.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index e071d23f6148..ef7240ace576 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -271,6 +271,11 @@ out: if (ret < 0) err = ret; dput(last); + /* last_name no longer match cache index */ + if (fi->readdir_cache_idx >= 0) { + fi->readdir_cache_idx = -1; + fi->dir_release_count = 0; + } } return err; } |