From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757356AbbCGKKX (ORCPT ); Sat, 7 Mar 2015 05:10:23 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:28886 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755789AbbCGKKS (ORCPT ); Sat, 7 Mar 2015 05:10:18 -0500 X-AuditID: cbfee6a1-f799b6d000003ba9-9b-54face898a64 Date: Sat, 07 Mar 2015 10:10:17 +0000 (GMT) From: Yuan Zhong Subject: [f2fs-dev] [PATCH 3/3] f2fs:use enum dentrt_ptr type to replace constant use To: Jaegeuk Kim Cc: "linux-kernel@vger.kernel.org" , "linux-f2fs-devel@lists.sourceforge.net" , "linux-fsdevel@vger.kernel.org" Reply-to: yuan.mark.zhong@samsung.com MIME-version: 1.0 X-MTR: 20150307100915023@yuan.mark.zhong Msgkey: 20150307100915023@yuan.mark.zhong X-EPLocale: en_US.windows-1252 X-Priority: 3 X-EPWebmail-Msg-Type: personal X-EPWebmail-Reply-Demand: 0 X-EPApproval-Locale: X-EPHeader: ML X-MLAttribute: X-RootMTR: 20150307100915023@yuan.mark.zhong X-ParentMTR: X-ArchiveUser: X-CPGSPASS: N X-ConfirmMail: N,general Content-type: text/plain; charset=windows-1252 MIME-version: 1.0 Message-id: <1592448705.458641425723017011.JavaMail.weblogic@epmlwas08b> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrIIsWRmVeSWpSXmKPExsVy+t/tXt3Oc79CDI4fU7K4vGsOmwOjx+dN cgGMUVw2Kak5mWWpRfp2CVwZl9a/YC84p1kxc10jawPjAY0uRk4OIQEtifc/HjKD2BICJhKt 619B2WISF+6tZ+ti5AKqmcMo8W/tVxaQBIuAisSfptNsIDabgL7EnX37GEFsYYFQiXONN9hB bBEBNYk9l7awgDQzC9xklOg50g80lQNokqrE8bWlIDW8AoISJ2c+YYFYpiGx8/oyFoi4pkRj /3dWiLicxJKpl5kgbF6JGe1PWWDi076ugTpUWuL8rA2MMEcv/v4YKs4vcez2DqheAYmpZw5C 1ehKrJ51nB3C5pNYs/AtC0z9rlPLmWF23d8yF6pXQmJryxOwe5gFFCWmdD9kh7ANJI4smsOK 7hdeAQ+JyUuXMk9glJ2FJDULSfssJO3IahYwsqxiFE0tSC4oTkqvMNQrTswtLs1L10vOz93E CI7oZwt3MH45b32IUYCDUYmH98WsXyFCrIllxZW5hxglOJiVRHhfdQGFeFMSK6tSi/Lji0pz UosPMUpzsCiJ8/4/lxsiJJCeWJKanZpakFoEk2Xi4JRqYMyavMRY+YlY3jr9jm4pr529TB+/ pyY5ep7ll9gUfcdyzkcZ87iGwvaoBwt9QwNVF7Dc9tKK/HRVxEtsZ4pjjO6PuQ8C+8+IJHAm LQ+7e8OH13t1S5mOwaaaP0UTyrf/S9oRblFwQbVF+fatWO8n1vKvexTLz2jU9NhlGt5Yxvbi 5sntqTNLlFiKMxINtZiLihMB0wvAv+QCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by nfs id t27AAXvF000759 The function make_dentry_ptr has an argument 'int type'. This argument is used to distinguish 'block dentry' and 'inline dentry'. We used 1 and 2 as the type. To make code more readable, we use enum type to replace constant use. Signed-off-by: Yuan Zhong --- fs/f2fs/dir.c | 8 ++++---- fs/f2fs/f2fs.h | 8 +++++++- fs/f2fs/inline.c | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 590aeef..c39a18f 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -99,7 +99,7 @@ static struct f2fs_dir_entry *find_in_block(struct page *dentry_page, dentry_blk = (struct f2fs_dentry_block *)kmap(dentry_page); - make_dentry_ptr(&d, (void *)dentry_blk, 1); + make_dentry_ptr(&d, (void *)dentry_blk, DENTRY_PTR_TYPE_BLOCK); de = find_target_dentry(name, max_slots, &d); if (de) @@ -360,7 +360,7 @@ static int make_empty_dir(struct inode *inode, dentry_blk = kmap_atomic(dentry_page); - make_dentry_ptr(&d, (void *)dentry_blk, 1); + make_dentry_ptr(&d, (void *)dentry_blk, DENTRY_PTR_TYPE_BLOCK); do_make_empty_dir(inode, parent, &d); kunmap_atomic(dentry_blk); @@ -571,7 +571,7 @@ add_dentry: goto fail; } - make_dentry_ptr(&d, (void *)dentry_blk, 1); + make_dentry_ptr(&d, (void *)dentry_blk, DENTRY_PTR_TYPE_BLOCK); f2fs_update_dentry(inode, &d, name, dentry_hash, bit_pos); set_page_dirty(dentry_page); @@ -782,7 +782,7 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) dentry_blk = kmap(dentry_page); - make_dentry_ptr(&d, (void *)dentry_blk, 1); + make_dentry_ptr(&d, (void *)dentry_blk, DENTRY_PTR_TYPE_BLOCK); if (f2fs_fill_dentries(ctx, &d, n * NR_DENTRY_IN_BLOCK)) goto stop; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 511d6cd..31b440e 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -236,10 +236,16 @@ struct f2fs_dentry_ptr { int max; }; +enum { + DENTRY_PTR_TYPE_BLOCK = 1, + DENTRY_PTR_TYPE_INLNE, + DENTRY_PTR_TYPE_MAX +}; + static inline void make_dentry_ptr(struct f2fs_dentry_ptr *d, void *src, int type) { - if (type == 1) { + if (type == DENTRY_PTR_TYPE_BLOCK) { struct f2fs_dentry_block *t = (struct f2fs_dentry_block *)src; d->max = NR_DENTRY_IN_BLOCK; d->bitmap = &t->dentry_bitmap; diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 4ba9732..ee0984c 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -271,7 +271,7 @@ struct f2fs_dir_entry *find_in_inline_dir(struct inode *dir, inline_dentry = inline_data_addr(ipage); - make_dentry_ptr(&d, (void *)inline_dentry, 2); + make_dentry_ptr(&d, (void *)inline_dentry, DENTRY_PTR_TYPE_INLNE); de = find_target_dentry(name, NULL, &d); unlock_page(ipage); @@ -315,7 +315,7 @@ int make_empty_inline_dir(struct inode *inode, struct inode *parent, dentry_blk = inline_data_addr(ipage); - make_dentry_ptr(&d, (void *)dentry_blk, 2); + make_dentry_ptr(&d, (void *)dentry_blk, DENTRY_PTR_TYPE_INLNE); do_make_empty_dir(inode, parent, &d); set_page_dirty(ipage); @@ -417,7 +417,7 @@ int f2fs_add_inline_entry(struct inode *dir, const struct qstr *name, f2fs_wait_on_page_writeback(ipage, NODE); name_hash = f2fs_dentry_hash(name); - make_dentry_ptr(&d, (void *)dentry_blk, 2); + make_dentry_ptr(&d, (void *)dentry_blk, DENTRY_PTR_TYPE_INLNE); f2fs_update_dentry(inode, &d, name, name_hash, bit_pos); set_page_dirty(ipage); @@ -507,7 +507,7 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx) inline_dentry = inline_data_addr(ipage); - make_dentry_ptr(&d, (void *)inline_dentry, 2); + make_dentry_ptr(&d, (void *)inline_dentry, DENTRY_PTR_TYPE_INLNE); if (!f2fs_fill_dentries(ctx, &d, 0)) ctx->pos = NR_INLINE_DENTRY; -- 1.7.9.5{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I