diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2013-11-30 12:47:41 +0800 |
|---|---|---|
| committer | Yan, Zheng <zheng.z.yan@intel.com> | 2014-01-21 13:29:33 +0800 |
| commit | 9215aeea622fec7ca8123c6bd6f03a1753e2b0b3 (patch) | |
| tree | 00c4aaae67c7891553f8331b6e0b6e54bf95d08f /fs/ceph/dir.c | |
| parent | ca18bede048e95a749d13410ce1da4ad0ffa7938 (diff) | |
| download | op-kernel-dev-9215aeea622fec7ca8123c6bd6f03a1753e2b0b3.zip op-kernel-dev-9215aeea622fec7ca8123c6bd6f03a1753e2b0b3.tar.gz | |
ceph: check inode caps in ceph_d_revalidate
Some inodes in readdir reply may have no caps. Getattr mds request
for these inodes can return -ESTALE. The fix is consider dentry that
links to inode with no caps as invalid. Invalid dentry causes a
lookup request to send to the mds, the MDS will send caps back.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Diffstat (limited to 'fs/ceph/dir.c')
| -rw-r--r-- | fs/ceph/dir.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index b629e9d..619616d 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -1041,14 +1041,19 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags) valid = 1; } else if (dentry_lease_is_valid(dentry) || dir_lease_is_valid(dir, dentry)) { - valid = 1; + if (dentry->d_inode) + valid = ceph_is_any_caps(dentry->d_inode); + else + valid = 1; } dout("d_revalidate %p %s\n", dentry, valid ? "valid" : "invalid"); - if (valid) + if (valid) { ceph_dentry_lru_touch(dentry); - else + } else { + ceph_dir_clear_complete(dir); d_drop(dentry); + } iput(dir); return valid; } |
