From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Yan, Zheng" Subject: [PATCH 3/4] ceph: simplify calling of ceph_get_fmode() Date: Thu, 20 Feb 2020 20:26:29 +0800 Message-ID: <20200220122630.63170-3-zyan@redhat.com> References: <20200220122630.63170-1-zyan@redhat.com> Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Return-path: Received: from us-smtp-2.mimecast.com ([205.139.110.61]:59215 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727233AbgBTM0o (ORCPT ); Thu, 20 Feb 2020 07:26:44 -0500 In-Reply-To: <20200220122630.63170-1-zyan@redhat.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: ceph-devel@vger.kernel.org Cc: jlayton@kernel.org, "Yan, Zheng" Call ceph_get_fmode() when initializing file. Because fill_inode() already calls ceph_touch_fmode() for open file request. It affects __ceph_caps_file_wanted() for 'caps_wanted_delay_min' seconds, enough for ceph_get_fmode() to get called by ceph_init_file_info(). Signed-off-by: "Yan, Zheng" --- fs/ceph/caps.c | 26 +++----------------------- fs/ceph/file.c | 21 +++++---------------- fs/ceph/inode.c | 8 +------- fs/ceph/super.h | 3 +-- 4 files changed, 10 insertions(+), 48 deletions(-) diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index ccdc47bd7cf0..2f4ff7e9508e 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -606,7 +606,7 @@ static void __check_cap_issue(struct ceph_inode_info = *ci, struct ceph_cap *cap, */ void ceph_add_cap(struct inode *inode, struct ceph_mds_session *session, u64 cap_id, - int fmode, unsigned issued, unsigned wanted, + unsigned issued, unsigned wanted, unsigned seq, unsigned mseq, u64 realmino, int flags, struct ceph_cap **new_cap) { @@ -622,13 +622,6 @@ void ceph_add_cap(struct inode *inode, dout("add_cap %p mds%d cap %llx %s seq %d\n", inode, session->s_mds, cap_id, ceph_cap_string(issued), seq); =20 - /* - * If we are opening the file, include file mode wanted bits - * in wanted. - */ - if (fmode >=3D 0) - wanted |=3D ceph_caps_for_mode(fmode); - spin_lock(&session->s_gen_ttl_lock); gen =3D session->s_cap_gen; spin_unlock(&session->s_gen_ttl_lock); @@ -753,9 +746,6 @@ void ceph_add_cap(struct inode *inode, cap->issue_seq =3D seq; cap->mseq =3D mseq; cap->cap_gen =3D gen; - - if (fmode >=3D 0) - __ceph_get_fmode(ci, fmode); } =20 /* @@ -3726,7 +3716,7 @@ static void handle_cap_export(struct inode *inode, = struct ceph_mds_caps *ex, /* add placeholder for the export tagert */ int flag =3D (cap =3D=3D ci->i_auth_cap) ? CEPH_CAP_FLAG_AUTH : 0; tcap =3D new_cap; - ceph_add_cap(inode, tsession, t_cap_id, -1, issued, 0, + ceph_add_cap(inode, tsession, t_cap_id, issued, 0, t_seq - 1, t_mseq, (u64)-1, flag, &new_cap); =20 if (!list_empty(&ci->i_cap_flush_list) && @@ -3831,7 +3821,7 @@ static void handle_cap_import(struct ceph_mds_clien= t *mdsc, __ceph_caps_issued(ci, &issued); issued |=3D __ceph_caps_dirty(ci); =20 - ceph_add_cap(inode, session, cap_id, -1, caps, wanted, seq, mseq, + ceph_add_cap(inode, session, cap_id, caps, wanted, seq, mseq, realmino, CEPH_CAP_FLAG_AUTH, &new_cap); =20 ocap =3D peer >=3D 0 ? __get_cap_for_mds(ci, peer) : NULL; @@ -4186,16 +4176,6 @@ void ceph_get_fmode(struct ceph_inode_info *ci, in= t fmode, int count) spin_unlock(&ci->i_ceph_lock); } =20 -void __ceph_get_fmode(struct ceph_inode_info *ci, int fmode) -{ - int i; - int bits =3D (fmode << 1) | 1; - for (i =3D 0; i < CEPH_FILE_MODE_BITS; i++) { - if (bits & (1 << i)) - ci->i_file_by_mode[i].nr++; - } -} - /* * Drop open file reference. If we were the last open file, * we may need to release capabilities to the MDS (or schedule diff --git a/fs/ceph/file.c b/fs/ceph/file.c index f28f420bad23..60a2dfa02ba2 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -212,10 +212,8 @@ static int ceph_init_file_info(struct inode *inode, = struct file *file, if (isdir) { struct ceph_dir_file_info *dfi =3D kmem_cache_zalloc(ceph_dir_file_cachep, GFP_KERNEL); - if (!dfi) { - ceph_put_fmode(ci, fmode, 1); /* clean up */ + if (!dfi) return -ENOMEM; - } =20 file->private_data =3D dfi; fi =3D &dfi->file_info; @@ -223,15 +221,15 @@ static int ceph_init_file_info(struct inode *inode,= struct file *file, dfi->readdir_cache_idx =3D -1; } else { fi =3D kmem_cache_zalloc(ceph_file_cachep, GFP_KERNEL); - if (!fi) { - ceph_put_fmode(ci, fmode, 1); /* clean up */ + if (!fi) return -ENOMEM; - } =20 file->private_data =3D fi; } =20 + ceph_get_fmode(ci, fmode, 1); fi->fmode =3D fmode; + spin_lock_init(&fi->rw_contexts_lock); INIT_LIST_HEAD(&fi->rw_contexts); fi->meta_err =3D errseq_sample(&ci->i_meta_err); @@ -263,7 +261,6 @@ static int ceph_init_file(struct inode *inode, struct= file *file, int fmode) case S_IFLNK: dout("init_file %p %p 0%o (symlink)\n", inode, file, inode->i_mode); - ceph_put_fmode(ceph_inode(inode), fmode, 1); /* clean up */ break; =20 default: @@ -273,7 +270,6 @@ static int ceph_init_file(struct inode *inode, struct= file *file, int fmode) * we need to drop the open ref now, since we don't * have .release set to ceph_release. */ - ceph_put_fmode(ceph_inode(inode), fmode, 1); /* clean up */ BUG_ON(inode->i_fop->release =3D=3D ceph_release); =20 /* call the proper open fop */ @@ -327,7 +323,6 @@ int ceph_renew_caps(struct inode *inode, int fmode) req->r_inode =3D inode; ihold(inode); req->r_num_caps =3D 1; - req->r_fmode =3D -1; =20 err =3D ceph_mdsc_do_request(mdsc, NULL, req); ceph_mdsc_put_request(req); @@ -373,9 +368,6 @@ int ceph_open(struct inode *inode, struct file *file) =20 /* trivially open snapdir */ if (ceph_snap(inode) =3D=3D CEPH_SNAPDIR) { - spin_lock(&ci->i_ceph_lock); - __ceph_get_fmode(ci, fmode); - spin_unlock(&ci->i_ceph_lock); return ceph_init_file(inode, file, fmode); } =20 @@ -393,7 +385,7 @@ int ceph_open(struct inode *inode, struct file *file) dout("open %p fmode %d want %s issued %s using existing\n", inode, fmode, ceph_cap_string(wanted), ceph_cap_string(issued)); - __ceph_get_fmode(ci, fmode); + __ceph_touch_fmode(ci, mdsc, fmode); spin_unlock(&ci->i_ceph_lock); =20 /* adjust wanted? */ @@ -405,7 +397,6 @@ int ceph_open(struct inode *inode, struct file *file) return ceph_init_file(inode, file, fmode); } else if (ceph_snap(inode) !=3D CEPH_NOSNAP && (ci->i_snap_caps & wanted) =3D=3D wanted) { - __ceph_get_fmode(ci, fmode); __ceph_touch_fmode(ci, mdsc, fmode); spin_unlock(&ci->i_ceph_lock); return ceph_init_file(inode, file, fmode); @@ -526,8 +517,6 @@ int ceph_atomic_open(struct inode *dir, struct dentry= *dentry, err =3D finish_open(file, dentry, ceph_open); } out_req: - if (!req->r_err && req->r_target_inode) - ceph_put_fmode(ceph_inode(req->r_target_inode), req->r_fmode, 1); ceph_mdsc_put_request(req); out_ctx: ceph_release_acl_sec_ctx(&as_ctx); diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index b279bd8e168e..bb73b0c8c4d9 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -969,7 +969,7 @@ static int fill_inode(struct inode *inode, struct pag= e *locked_page, if (ceph_snap(inode) =3D=3D CEPH_NOSNAP) { ceph_add_cap(inode, session, le64_to_cpu(info->cap.cap_id), - cap_fmode, info_caps, + info_caps, le32_to_cpu(info->cap.wanted), le32_to_cpu(info->cap.seq), le32_to_cpu(info->cap.mseq), @@ -994,13 +994,7 @@ static int fill_inode(struct inode *inode, struct pa= ge *locked_page, dout(" %p got snap_caps %s\n", inode, ceph_cap_string(info_caps)); ci->i_snap_caps |=3D info_caps; - if (cap_fmode >=3D 0) - __ceph_get_fmode(ci, cap_fmode); } - } else if (cap_fmode >=3D 0) { - pr_warn("mds issued no caps on %llx.%llx\n", - ceph_vinop(inode)); - __ceph_get_fmode(ci, cap_fmode); } =20 if (iinfo->inline_version > 0 && diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 029823643b8b..1ea76466efcb 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -1038,7 +1038,7 @@ extern struct ceph_cap *ceph_get_cap(struct ceph_md= s_client *mdsc, struct ceph_cap_reservation *ctx); extern void ceph_add_cap(struct inode *inode, struct ceph_mds_session *session, u64 cap_id, - int fmode, unsigned issued, unsigned wanted, + unsigned issued, unsigned wanted, unsigned cap, unsigned seq, u64 realmino, int flags, struct ceph_cap **new_cap); extern void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release); @@ -1080,7 +1080,6 @@ extern int ceph_try_get_caps(struct inode *inode, int need, int want, bool nonblock, int *got); =20 /* for counting open files by mode */ -extern void __ceph_get_fmode(struct ceph_inode_info *ci, int mode); extern void ceph_get_fmode(struct ceph_inode_info *ci, int mode, int cou= nt); extern void ceph_put_fmode(struct ceph_inode_info *ci, int mode, int cou= nt); extern void __ceph_touch_fmode(struct ceph_inode_info *ci, --=20 2.21.1