From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + fs-affs-add-validation-block-function.patch added to -mm tree Date: Wed, 18 Jan 2017 13:44:31 -0800 Message-ID: <587fe1bf.iOS8jdjLX4dC/vje%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:37856 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752171AbdARVoc (ORCPT ); Wed, 18 Jan 2017 16:44:32 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: fabf@skynet.be, viro@zeniv.linux.org.uk, mm-commits@vger.kernel.org The patch titled Subject: fs/affs: add validation block function has been added to the -mm tree. Its filename is fs-affs-add-validation-block-function.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/fs-affs-add-validation-block-function.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/fs-affs-add-validation-block-function.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Fabian Frederick Subject: fs/affs: add validation block function Avoid repeating 4 times the same calculation. Link: http://lkml.kernel.org/r/20170109191208.6085-3-fabf@skynet.be Signed-off-by: Fabian Frederick Cc: Al Viro Signed-off-by: Andrew Morton --- fs/affs/affs.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff -puN fs/affs/affs.h~fs-affs-add-validation-block-function fs/affs/affs.h --- a/fs/affs/affs.h~fs-affs-add-validation-block-function +++ a/fs/affs/affs.h @@ -212,6 +212,12 @@ extern const struct address_space_operat extern const struct dentry_operations affs_dentry_operations; extern const struct dentry_operations affs_intl_dentry_operations; +static inline bool affs_validblock(struct super_block *sb, int block) +{ + return(block >= AFFS_SB(sb)->s_reserved && + block < AFFS_SB(sb)->s_partition_size); +} + static inline void affs_set_blocksize(struct super_block *sb, int size) { @@ -221,7 +227,7 @@ static inline struct buffer_head * affs_bread(struct super_block *sb, int block) { pr_debug("%s: %d\n", __func__, block); - if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size) + if (affs_validblock(sb, block)) return sb_bread(sb, block); return NULL; } @@ -229,7 +235,7 @@ static inline struct buffer_head * affs_getblk(struct super_block *sb, int block) { pr_debug("%s: %d\n", __func__, block); - if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size) + if (affs_validblock(sb, block)) return sb_getblk(sb, block); return NULL; } @@ -238,7 +244,7 @@ affs_getzeroblk(struct super_block *sb, { struct buffer_head *bh; pr_debug("%s: %d\n", __func__, block); - if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size) { + if (affs_validblock(sb, block)) { bh = sb_getblk(sb, block); lock_buffer(bh); memset(bh->b_data, 0 , sb->s_blocksize); @@ -253,7 +259,7 @@ affs_getemptyblk(struct super_block *sb, { struct buffer_head *bh; pr_debug("%s: %d\n", __func__, block); - if (block >= AFFS_SB(sb)->s_reserved && block < AFFS_SB(sb)->s_partition_size) { + if (affs_validblock(sb, block)) { bh = sb_getblk(sb, block); wait_on_buffer(bh); set_buffer_uptodate(bh); _ Patches currently in -mm which might be from fabf@skynet.be are documentation-filesystems-proctxt-add-vmpin.patch fs-affs-remove-reference-to-affs_parent_ino.patch fs-affs-add-validation-block-function.patch fs-affs-make-affs-exportable.patch fs-affs-use-octal-for-permissions.patch fs-affs-add-prefix-to-some-functions.patch fs-affs-nameic-forward-declarations-clean-up.patch fs-affs-make-export-work-with-cold-dcache.patch fs-add-i_blocksize.patch