From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752963AbdHOPii (ORCPT ); Tue, 15 Aug 2017 11:38:38 -0400 Received: from mout.web.de ([212.227.15.14]:58890 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752167AbdHOPif (ORCPT ); Tue, 15 Aug 2017 11:38:35 -0400 Subject: [PATCH 2/3] fs-udf: Improve six size determinations From: SF Markus Elfring To: Jan Kara , kernel-janitors@vger.kernel.org Cc: LKML References: <6eedcf1a-57f0-2ba4-d1b8-47a8da945d87@users.sourceforge.net> Message-ID: <338dd742-de63-836c-87f6-0efc4732e7f0@users.sourceforge.net> Date: Tue, 15 Aug 2017 17:37:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <6eedcf1a-57f0-2ba4-d1b8-47a8da945d87@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:4QGwjlenqq3+J/ZmgZiRBiK7hgwuhAg25KPswHkX58YKggGNeUH cMBUoAVCFM6E0+fk1+OB+CTKBfAs2iwb9oCqGEBHYDEiCpW8EYc64opm0ffGbZgOdRv6UPL 19oxxXFsu6UT7KtJdmYW1Pri/rojQuqavbeZoB2euk3CK++4I7YFVNjAEKaSsrqUipwjeRa ohdIJSupviNE/AqFIvAgw== X-UI-Out-Filterresults: notjunk:1;V01:K0:YkLN6qjqwps=:HH0jOUor0caeAUQHot8BGJ sgFI5MmvKx8nMrQWzttV9mgsi5ecJdW1g5hHIdmnrBE3bA5GRgzSyyyAR9h4ztF60m2dZyWUx rWJvM4NBxK5fcQEBCJ6MB2chIW5iUqru4/ACyu/NgXP5jjUuvvNYcqO3nAwMtxdzgV2OlQEtP PGdOPYuNVVs7C2H7dJ17wQSK7uDZOrTWVdmCUJQcLEs3x2cciobgWXDrPe4eW9ZtgXcR4GqCg pDA+9x4pIk0O/SuysHP0kZ/mKWEZzG2hE8ithFDIcW/Yvx7nXSR5/qFKnPUQ+pbSdZ+rLmpan XdlNkB3UrmYwHCEjn9cTxyJAWjVxCaR/UeyLIRXz0+GE2mWqtG+3Q0lzh9LJACWrvVqSA5q2Z RKKhjbATfhdD1hdFva88LnGrR7+46Yf4akMvUgGQrqMKWqVC8M+MerGpArazjG7VYsmj0F8QU OvjGMNEZNix67AtnCeR8f3H1aW7hM2MNr0zRoqXxNp4OvvtnI/X3lP5RCvnlwcQiMngT6Q0GP 9283WKwZ7I7UsGd2HLdRBE+X0rARxsrVW+bbPs9mgft7L4A9bcfGCFBBOrUJmzbR1d4tygG9M WG3dxYe8/x9z5hJPKvNo+KAaxwVVQc6K76MPXDxqsKPx4a20R1Aw1mBN9jnozx7HiXU+lowFx mEH3icHQCsmBpkhwZy/p3lgBB0yQw0lGwplaMbBIII2LHWXPfLyAs3tZSbcvOVP7MAuwU4bUH MurU46H5Y23Q4obBWG4/pO+0Lp+NtNLVbT2Tw7fUWjHUkL18xgbNbd5Arqcq9rm+PInWoHUS8 aR71Mqf7/PCeCZqUaHES8BUHUblRQdZmS7GaOH1Wl6E2stoHeY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 15 Aug 2017 16:45:44 +0200 Replace the specification of data structures by variable references as the parameter for the operator "sizeof" to make the corresponding size determination a bit safer according to the Linux coding style convention. Signed-off-by: Markus Elfring --- fs/udf/inode.c | 6 +++--- fs/udf/namei.c | 2 +- fs/udf/super.c | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 7b50afc6e0c3..8dacf4f57414 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -114,7 +114,7 @@ static void udf_update_extent_cache(struct inode *inode, loff_t estart, __udf_clear_extent_cache(inode); if (pos->bh) get_bh(pos->bh); - memcpy(&iinfo->cached_extent.epos, pos, sizeof(struct extent_position)); + memcpy(&iinfo->cached_extent.epos, pos, sizeof(*pos)); iinfo->cached_extent.lstart = estart; switch (iinfo->i_alloc_type) { case ICBTAG_FLAG_AD_SHORT: @@ -1698,7 +1698,7 @@ static int udf_update_inode(struct inode *inode, int do_sync) dsea->impUseLength = cpu_to_le32(sizeof(struct regid)); } eid = (struct regid *)dsea->impUse; - memset(eid, 0, sizeof(struct regid)); + memset(eid, 0, sizeof(*eid)); strcpy(eid->ident, UDF_ID_DEVELOPER); eid->identSuffix[0] = UDF_OS_CLASS_UNIX; eid->identSuffix[1] = UDF_OS_ID_LINUX; @@ -1749,7 +1749,7 @@ static int udf_update_inode(struct inode *inode, int do_sync) udf_time_to_disk_stamp(&efe->createTime, iinfo->i_crtime); udf_time_to_disk_stamp(&efe->attrTime, inode->i_ctime); - memset(&(efe->impIdent), 0, sizeof(struct regid)); + memset(&(efe->impIdent), 0, sizeof(efe->impIdent)); strcpy(efe->impIdent.ident, UDF_ID_DEVELOPER); efe->impIdent.identSuffix[0] = UDF_OS_CLASS_UNIX; efe->impIdent.identSuffix[1] = UDF_OS_ID_LINUX; diff --git a/fs/udf/namei.c b/fs/udf/namei.c index 385ee89d5824..885198dfd9f8 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -1184,7 +1184,7 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry, */ ncfi.fileVersionNum = ocfi.fileVersionNum; ncfi.fileCharacteristics = ocfi.fileCharacteristics; - memcpy(&(ncfi.icb), &(ocfi.icb), sizeof(struct long_ad)); + memcpy(&(ncfi.icb), &(ocfi.icb), sizeof(ocfi.icb)); udf_write_fi(new_dir, &ncfi, nfi, &nfibh, NULL, NULL); /* The old fid may have moved - find it again */ diff --git a/fs/udf/super.c b/fs/udf/super.c index ca4b4274b524..0dc7c2d9f0fa 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -266,6 +266,5 @@ static int udf_sb_alloc_partition_maps(struct super_block *sb, u32 count) { struct udf_sb_info *sbi = UDF_SB(sb); - sbi->s_partmaps = kcalloc(count, sizeof(struct udf_part_map), - GFP_KERNEL); + sbi->s_partmaps = kcalloc(count, sizeof(*sbi->s_partmaps), GFP_KERNEL); if (!sbi->s_partmaps) { @@ -2097,7 +2096,7 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent) uopt.fmode = UDF_INVALID_MODE; uopt.dmode = UDF_INVALID_MODE; - sbi = kzalloc(sizeof(struct udf_sb_info), GFP_KERNEL); + sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) return -ENOMEM; -- 2.14.0