Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: disable use of dcache for readdir etc.
This commit is contained in:
commit
d65616a92c
|
@ -1094,42 +1094,19 @@ static int ceph_snapdir_d_revalidate(struct dentry *dentry,
|
||||||
/*
|
/*
|
||||||
* Set/clear/test dir complete flag on the dir's dentry.
|
* Set/clear/test dir complete flag on the dir's dentry.
|
||||||
*/
|
*/
|
||||||
static struct dentry * __d_find_any_alias(struct inode *inode)
|
|
||||||
{
|
|
||||||
struct dentry *alias;
|
|
||||||
|
|
||||||
if (list_empty(&inode->i_dentry))
|
|
||||||
return NULL;
|
|
||||||
alias = list_first_entry(&inode->i_dentry, struct dentry, d_alias);
|
|
||||||
return alias;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ceph_dir_set_complete(struct inode *inode)
|
void ceph_dir_set_complete(struct inode *inode)
|
||||||
{
|
{
|
||||||
struct dentry *dentry = __d_find_any_alias(inode);
|
/* not yet implemented */
|
||||||
|
|
||||||
if (dentry && ceph_dentry(dentry)) {
|
|
||||||
dout(" marking %p (%p) complete\n", inode, dentry);
|
|
||||||
set_bit(CEPH_D_COMPLETE, &ceph_dentry(dentry)->flags);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ceph_dir_clear_complete(struct inode *inode)
|
void ceph_dir_clear_complete(struct inode *inode)
|
||||||
{
|
{
|
||||||
struct dentry *dentry = __d_find_any_alias(inode);
|
/* not yet implemented */
|
||||||
|
|
||||||
if (dentry && ceph_dentry(dentry)) {
|
|
||||||
dout(" marking %p (%p) NOT complete\n", inode, dentry);
|
|
||||||
clear_bit(CEPH_D_COMPLETE, &ceph_dentry(dentry)->flags);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ceph_dir_test_complete(struct inode *inode)
|
bool ceph_dir_test_complete(struct inode *inode)
|
||||||
{
|
{
|
||||||
struct dentry *dentry = __d_find_any_alias(inode);
|
/* not yet implemented */
|
||||||
|
|
||||||
if (dentry && ceph_dentry(dentry))
|
|
||||||
return test_bit(CEPH_D_COMPLETE, &ceph_dentry(dentry)->flags);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue