ceph: hide /.ceph from readdir results
We need to skip /.ceph in (cached) readdir results, and exclude "/.ceph" from the cached ENOENT lookup check. Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
parent
50b885b96c
commit
1d1de9160e
|
@ -44,6 +44,7 @@
|
||||||
|
|
||||||
|
|
||||||
#define CEPH_INO_ROOT 1
|
#define CEPH_INO_ROOT 1
|
||||||
|
#define CEPH_INO_CEPH 2 /* hidden .ceph dir */
|
||||||
|
|
||||||
/* arbitrary limit on max # of monitors (cluster of 3 is typical) */
|
/* arbitrary limit on max # of monitors (cluster of 3 is typical) */
|
||||||
#define CEPH_MAX_MON 31
|
#define CEPH_MAX_MON 31
|
||||||
|
|
|
@ -132,6 +132,7 @@ more:
|
||||||
}
|
}
|
||||||
if (!d_unhashed(dentry) && dentry->d_inode &&
|
if (!d_unhashed(dentry) && dentry->d_inode &&
|
||||||
ceph_snap(dentry->d_inode) != CEPH_SNAPDIR &&
|
ceph_snap(dentry->d_inode) != CEPH_SNAPDIR &&
|
||||||
|
ceph_ino(dentry->d_inode) != CEPH_INO_CEPH &&
|
||||||
filp->f_pos <= di->offset)
|
filp->f_pos <= di->offset)
|
||||||
break;
|
break;
|
||||||
dout(" skipping %p %.*s at %llu (%llu)%s%s\n", dentry,
|
dout(" skipping %p %.*s at %llu (%llu)%s%s\n", dentry,
|
||||||
|
@ -512,6 +513,12 @@ struct dentry *ceph_finish_lookup(struct ceph_mds_request *req,
|
||||||
return dentry;
|
return dentry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int is_root_ceph_dentry(struct inode *inode, struct dentry *dentry)
|
||||||
|
{
|
||||||
|
return ceph_ino(inode) == CEPH_INO_ROOT &&
|
||||||
|
strncmp(dentry->d_name.name, ".ceph", 5) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Look up a single dir entry. If there is a lookup intent, inform
|
* Look up a single dir entry. If there is a lookup intent, inform
|
||||||
* the MDS so that it gets our 'caps wanted' value in a single op.
|
* the MDS so that it gets our 'caps wanted' value in a single op.
|
||||||
|
@ -554,6 +561,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
|
||||||
if (strncmp(dentry->d_name.name,
|
if (strncmp(dentry->d_name.name,
|
||||||
client->mount_args->snapdir_name,
|
client->mount_args->snapdir_name,
|
||||||
dentry->d_name.len) &&
|
dentry->d_name.len) &&
|
||||||
|
!is_root_ceph_dentry(dir, dentry) &&
|
||||||
(ci->i_ceph_flags & CEPH_I_COMPLETE) &&
|
(ci->i_ceph_flags & CEPH_I_COMPLETE) &&
|
||||||
(__ceph_caps_issued_mask(ci, CEPH_CAP_FILE_SHARED, 1))) {
|
(__ceph_caps_issued_mask(ci, CEPH_CAP_FILE_SHARED, 1))) {
|
||||||
di->offset = ci->i_max_offset++;
|
di->offset = ci->i_max_offset++;
|
||||||
|
|
Loading…
Reference in New Issue