diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2014-04-06 14:10:04 +0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2014-04-06 09:13:14 -0700 |
| commit | a30be7cb2ccb995ad5e67fd4b548f11fe37fc8b1 (patch) | |
| tree | 5f0927538f5e54ea9b6be1ec95e571d569975ca0 /fs/ceph | |
| parent | 8a53f23fcda355958a79774c6333a3a31c380ecf (diff) | |
| download | linux-a30be7cb2ccb995ad5e67fd4b548f11fe37fc8b1.tar.gz linux-a30be7cb2ccb995ad5e67fd4b548f11fe37fc8b1.tar.bz2 linux-a30be7cb2ccb995ad5e67fd4b548f11fe37fc8b1.zip | |
ceph: skip invalid dentry during dcache readdir
skip dentries that were added before MDS issued FILE_SHARED to
client.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/dir.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index 46cd092cb013..766410a12c2c 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -119,7 +119,8 @@ static int fpos_cmp(loff_t l, loff_t r) * defined IFF we hold CEPH_CAP_FILE_SHARED (which will be revoked by * the MDS if/when the directory is modified). */ -static int __dcache_readdir(struct file *file, struct dir_context *ctx) +static int __dcache_readdir(struct file *file, struct dir_context *ctx, + u32 shared_gen) { struct ceph_file_info *fi = file->private_data; struct dentry *parent = file->f_dentry; @@ -133,8 +134,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx) last = fi->dentry; fi->dentry = NULL; - dout("__dcache_readdir %p at %llu (last %p)\n", dir, ctx->pos, - last); + dout("__dcache_readdir %p v%u at %llu (last %p)\n", + dir, shared_gen, ctx->pos, last); spin_lock(&parent->d_lock); @@ -161,7 +162,8 @@ more: goto out_unlock; } spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED); - if (!d_unhashed(dentry) && dentry->d_inode && + if (di->lease_shared_gen == shared_gen && + !d_unhashed(dentry) && dentry->d_inode && ceph_snap(dentry->d_inode) != CEPH_SNAPDIR && ceph_ino(dentry->d_inode) != CEPH_INO_CEPH && fpos_cmp(ctx->pos, di->offset) <= 0) @@ -289,8 +291,9 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) ceph_snap(inode) != CEPH_SNAPDIR && __ceph_dir_is_complete(ci) && __ceph_caps_issued_mask(ci, CEPH_CAP_FILE_SHARED, 1)) { + u32 shared_gen = ci->i_shared_gen; spin_unlock(&ci->i_ceph_lock); - err = __dcache_readdir(file, ctx); + err = __dcache_readdir(file, ctx, shared_gen); if (err != -EAGAIN) return err; } else { |