On Mon, Jul 9, 2018 at 10:20 PM Chengguang Xu <cgxu519@xxxxxxx> wrote:
>
> When file num exceeds quota limit or fails from ceph_per_init_acls()
> should call d_drop to drop dentry from cache as well.
>
> Signed-off-by: Chengguang Xu <cgxu519@xxxxxxx>
> ---
> Hello,
>
> Sorry, I haven't got resource to fully test this patch, so please review.
>
> fs/ceph/dir.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
> index 036ac0f3a393..813c01e8ad05 100644
> --- a/fs/ceph/dir.c
> +++ b/fs/ceph/dir.c
> @@ -827,19 +827,21 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,
> if (ceph_snap(dir) != CEPH_NOSNAP)
> return -EROFS;
>
> - if (ceph_quota_is_max_files_exceeded(dir))
> - return -EDQUOT;
> + if (ceph_quota_is_max_files_exceeded(dir)) {
> + err = -EDQUOT;
> + goto out;
> + }
>
> err = ceph_pre_init_acls(dir, &mode, &acls);
> if (err < 0)
> - return err;
> + goto out;
>
> dout("mknod in dir %p dentry %p mode 0%ho rdev %d\n",
> dir, dentry, mode, rdev);
> req = ceph_mdsc_create_request(mdsc, CEPH_MDS_OP_MKNOD, USE_AUTH_MDS);
> if (IS_ERR(req)) {
> err = PTR_ERR(req);
> - goto out;
> + goto out2;
> }
> req->r_dentry = dget(dentry);
> req->r_num_caps = 2;
> @@ -857,12 +859,14 @@ static int ceph_mknod(struct inode *dir, struct dentry *dentry,
> if (!err && !req->r_reply_info.head->is_dentry)
> err = ceph_handle_notrace_create(dir, dentry);
> ceph_mdsc_put_request(req);
> -out:
> +
> if (!err)
> ceph_init_inode_acls(d_inode(dentry), &acls);
> - else
> - d_drop(dentry);
> +out2:
> ceph_release_acls_info(&acls);
> +out:
> + if (err)
> + d_drop(dentry);
> return err;
> }
>
> --
> 2.17.1
>
Both patches are applied, Thanks.
Yan, Zheng
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
