From: Xiubo Li <xiubli@xxxxxxxxxx>
The inode for '.snap' directory will always with no key setup, so
we can use the parent inode to do this.
Signed-off-by: Xiubo Li <xiubli@xxxxxxxxxx>
---
fs/ceph/dir.c | 17 ++++++++++-------
fs/ceph/inode.c | 15 +++++++++------
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index a449f4a07c07..f0b28f210636 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -308,7 +308,7 @@ static bool need_send_readdir(struct ceph_dir_file_info *dfi, loff_t pos)
static int ceph_readdir(struct file *file, struct dir_context *ctx)
{
struct ceph_dir_file_info *dfi = file->private_data;
- struct inode *inode = file_inode(file);
+ struct inode *inode = file_inode(file), *pinode;
struct ceph_inode_info *ci = ceph_inode(inode);
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -347,7 +347,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
err = fscrypt_prepare_readdir(inode);
if (err)
- goto out;
+ return err;
spin_lock(&ci->i_ceph_lock);
/* request Fx cap. if have Fx, we don't need to release Fs cap
@@ -369,11 +369,13 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
spin_unlock(&ci->i_ceph_lock);
}
- err = ceph_fname_alloc_buffer(inode, &tname);
+ pinode = ceph_get_snap_parent_inode(inode);
+
+ err = ceph_fname_alloc_buffer(pinode, &tname);
if (err < 0)
goto out;
- err = ceph_fname_alloc_buffer(inode, &oname);
+ err = ceph_fname_alloc_buffer(pinode, &oname);
if (err < 0)
goto out;
@@ -527,7 +529,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
}
for (; i < rinfo->dir_nr; i++) {
struct ceph_mds_reply_dir_entry *rde = rinfo->dir_entries + i;
- struct ceph_fname fname = { .dir = inode,
+ struct ceph_fname fname = { .dir = pinode,
.name = rde->name,
.name_len = rde->name_len,
.ctext = rde->altname,
@@ -615,8 +617,9 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
err = 0;
dout("readdir %p file %p done.\n", inode, file);
out:
- ceph_fname_free_buffer(inode, &tname);
- ceph_fname_free_buffer(inode, &oname);
+ ceph_fname_free_buffer(pinode, &tname);
+ ceph_fname_free_buffer(pinode, &oname);
+ iput(pinode);
return err;
}
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 8b0832271fdf..9cef99f78958 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1817,7 +1817,7 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
struct ceph_mds_reply_info_parsed *rinfo = &req->r_reply_info;
struct qstr dname;
struct dentry *dn;
- struct inode *in;
+ struct inode *in, *pinode;
int err = 0, skipped = 0, ret, i;
u32 frag = le32_to_cpu(req->r_args.readdir.frag);
u32 last_hash = 0;
@@ -1876,11 +1876,13 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
cache_ctl.index = req->r_readdir_cache_idx;
fpos_offset = req->r_readdir_offset;
- err = ceph_fname_alloc_buffer(inode, &tname);
+ pinode = ceph_get_snap_parent_inode(inode);
+
+ err = ceph_fname_alloc_buffer(pinode, &tname);
if (err < 0)
goto out;
- err = ceph_fname_alloc_buffer(inode, &oname);
+ err = ceph_fname_alloc_buffer(pinode, &oname);
if (err < 0)
goto out;
@@ -1890,7 +1892,7 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
struct ceph_mds_reply_dir_entry *rde = rinfo->dir_entries + i;
struct ceph_vino tvino;
u32 olen = oname.len;
- struct ceph_fname fname = { .dir = inode,
+ struct ceph_fname fname = { .dir = pinode,
.name = rde->name,
.name_len = rde->name_len,
.ctext = rde->altname,
@@ -2029,8 +2031,9 @@ int ceph_readdir_prepopulate(struct ceph_mds_request *req,
req->r_readdir_cache_idx = cache_ctl.index;
}
ceph_readdir_cache_release(&cache_ctl);
- ceph_fname_free_buffer(inode, &tname);
- ceph_fname_free_buffer(inode, &oname);
+ ceph_fname_free_buffer(pinode, &tname);
+ ceph_fname_free_buffer(pinode, &oname);
+ iput(pinode);
dout("readdir_prepopulate done\n");
return err;
}
--
2.27.0
