diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 00:13:41 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 00:13:41 +0100 |
| commit | 917fef6f7ee8b2fe852692ac49771342bfef9433 (patch) | |
| tree | b5932aab90d449841803b6f8679a4564ca2a6eaf /fs/ceph/inode.c | |
| parent | kernel-doc: add support for one line inline struct member doc comments (diff) | |
| parent | Linux 4.9-rc4 (diff) | |
| download | linux-917fef6f7ee8b2fe852692ac49771342bfef9433.tar.xz linux-917fef6f7ee8b2fe852692ac49771342bfef9433.zip | |
Merge tag 'v4.9-rc4' into sound
Bring in -rc4 patches so I can successfully merge the sound doc changes.
Diffstat (limited to 'fs/ceph/inode.c')
| -rw-r--r-- | fs/ceph/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index bca1b49c1c4b..ef4d04647325 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1511,7 +1511,8 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req, ceph_fill_dirfrag(d_inode(parent), rinfo->dir_dir); } - if (ceph_frag_is_leftmost(frag) && req->r_readdir_offset == 2) { + if (ceph_frag_is_leftmost(frag) && req->r_readdir_offset == 2 && + !(rinfo->hash_order && req->r_path2)) { /* note dir version at start of readdir so we can tell * if any dentries get dropped */ req->r_dir_release_cnt = atomic64_read(&ci->i_release_count); |