On Thu, Jun 3, 2021 at 2:38 PM Jeff Layton <jlayton@xxxxxxxxxx> wrote:
>
> Commit aa60cfc3f7ee broke the error handling in these functions such
> that they don't handle non-ENOENT errors from ceph_mdsc_do_request
> properly.
>
> Move the checking of -ENOENT out of ceph_handle_snapdir and into the
> callers, and if we get a different error, return it immediately.
>
> Fixes: aa60cfc3f7ee ("ceph: don't use d_add in ceph_handle_snapdir")
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> ---
> fs/ceph/dir.c | 17 ++++++-----------
> fs/ceph/file.c | 6 +++---
> fs/ceph/super.h | 2 +-
> 3 files changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
> index 5624fae7a603..ac431246e0c9 100644
> --- a/fs/ceph/dir.c
> +++ b/fs/ceph/dir.c
> @@ -668,14 +668,13 @@ static loff_t ceph_dir_llseek(struct file *file, loff_t offset, int whence)
> * Handle lookups for the hidden .snap directory.
> */
> struct dentry *ceph_handle_snapdir(struct ceph_mds_request *req,
> - struct dentry *dentry, int err)
> + struct dentry *dentry)
> {
> struct ceph_fs_client *fsc = ceph_sb_to_client(dentry->d_sb);
> struct inode *parent = d_inode(dentry->d_parent); /* we hold i_mutex */
>
> /* .snap dir? */
> - if (err == -ENOENT &&
> - ceph_snap(parent) == CEPH_NOSNAP &&
> + if (ceph_snap(parent) == CEPH_NOSNAP &&
> strcmp(dentry->d_name.name, fsc->mount_options->snapdir_name) == 0) {
> struct dentry *res;
> struct inode *inode = ceph_get_snapdir(parent);
> @@ -742,7 +741,6 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
> struct ceph_fs_client *fsc = ceph_sb_to_client(dir->i_sb);
> struct ceph_mds_client *mdsc = ceph_sb_to_mdsc(dir->i_sb);
> struct ceph_mds_request *req;
> - struct dentry *res;
> int op;
> int mask;
> int err;
> @@ -793,13 +791,10 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
> req->r_parent = dir;
> set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags);
> err = ceph_mdsc_do_request(mdsc, NULL, req);
> - res = ceph_handle_snapdir(req, dentry, err);
> - if (IS_ERR(res)) {
> - err = PTR_ERR(res);
> - } else {
> - dentry = res;
> - err = 0;
> - }
> + if (err == -ENOENT)
> + dentry = ceph_handle_snapdir(req, dentry);
> + if (IS_ERR(dentry))
> + err = PTR_ERR(dentry);
> dentry = ceph_finish_lookup(req, dentry, err);
> ceph_mdsc_put_request(req); /* will dput(dentry) */
> dout("lookup result=%p\n", dentry);
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index 7aa20d50a231..a01ad342a91d 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -739,14 +739,14 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
> err = ceph_mdsc_do_request(mdsc,
> (flags & (O_CREAT|O_TRUNC)) ? dir : NULL,
> req);
> - dentry = ceph_handle_snapdir(req, dentry, err);
> + if (err == -ENOENT)
> + dentry = ceph_handle_snapdir(req, dentry);
> if (IS_ERR(dentry)) {
> err = PTR_ERR(dentry);
> goto out_req;
> }
Hi Jeff,
This doesn't seem right to me. Looking at 5.12, ENOENT from
ceph_mdsc_do_request() could be resolved by ceph_handle_snapdir()
meaning that ceph_handle_notrace_create() could be called and
ceph_finish_lookup() could be passed err == 0.
With this patch err would remain ENOENT, resulting in skipping
the potential ceph_handle_notrace_create() call and passing that
ENOENT to ceph_finish_lookup().
Thanks,
Ilya
