The patch titled udf: fix sparse warning in namei.c has been removed from the -mm tree. Its filename was udf-fix-sparse-warning-in-nameic.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: udf: fix sparse warning in namei.c From: Harvey Harrison <harvey.harrison@xxxxxxxxx> Let's use bsize instead. fs/udf/namei.c:960:12: warning: symbol 'elen' shadows an earlier one fs/udf/namei.c:937:15: originally declared here Signed-off-by: Harvey Harrison <harvey.harrison@xxxxxxxxx> Cc: Jan Kara <jack@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/udf/namei.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN fs/udf/namei.c~udf-fix-sparse-warning-in-nameic fs/udf/namei.c --- a/fs/udf/namei.c~udf-fix-sparse-warning-in-nameic +++ a/fs/udf/namei.c @@ -890,7 +890,7 @@ static int udf_symlink(struct inode *dir if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) { kernel_lb_addr eloc; - uint32_t elen; + uint32_t bsize; block = udf_new_block(inode->i_sb, inode, iinfo->i_location.partitionReferenceNum, @@ -903,9 +903,9 @@ static int udf_symlink(struct inode *dir eloc.logicalBlockNum = block; eloc.partitionReferenceNum = iinfo->i_location.partitionReferenceNum; - elen = inode->i_sb->s_blocksize; - iinfo->i_lenExtents = elen; - udf_add_aext(inode, &epos, eloc, elen, 0); + bsize = inode->i_sb->s_blocksize; + iinfo->i_lenExtents = bsize; + udf_add_aext(inode, &epos, eloc, bsize, 0); brelse(epos.bh); block = udf_get_pblock(inode->i_sb, block, _ Patches currently in -mm which might be from harvey.harrison@xxxxxxxxx are origin.patch cifs-remove-global_extern-macro.patch input-replace-remaining-__function__-occurrences.patch git-kvm.patch git-mips.patch git-nfsd.patch nfs-replace-remaining-__function__-occurrences.patch parisc-replace-remaining-__function__-occurences.patch drivers-parisc-replace-remaining-__function__-occurrences.patch pcmcia-replace-remaining-__function__-occurrences.patch scsi-replace-remaining-__function__-occurrences.patch fusion-replace-remaining-__function__-occurrences.patch scsi-replace-__inline-with-inline.patch git-watchdog.patch git-xfs.patch xtensa-replace-remaining-__function__-occurences.patch power-replace-remaining-__function__-occurrences.patch adfs-work-around-bogus-sparse-warning.patch coda-add-static-to-functions-in-dirc.patch befs-fix-sparse-warning-in-linuxvfsc.patch autofs4-fix-sparse-warning-in-rootc.patch firmware-replace-remaining-__function__-occurrences.patch drivers-misc-replace-remaining-__function__-occurrences.patch xen-make-blkif_getgeo-static.patch ecryptfs-replace-remaining-__function__-occurrences.patch cgroup-fix-sparse-warning-of-shadow-symbol-in-cgroupc.patch ext4-replace-remaining-__function__-occurrences.patch jdb2-replace-remaining-__function__-occurrences.patch char-fix-sparse-shadowed-variable-warnings-in-espc.patch char-espc-fix-possible-double-unlock.patch char-rocketc-fix-sparse-variable-shadowing-and-int-as-null-pointer.patch cycladesc-fix-sparse-shadowed-variable-warnings.patch epcac-static-functions-and-integer-as-null-pointer-fixes.patch epcac-static-functions-and-integer-as-null-pointer-fixes-checkpatch-fixes.patch add-macros-similar-to-min-max-min_t-max_t.patch add-macros-similar-to-min-max-min_t-max_t-doc.patch ide-eliminate-fit-macro.patch ata-remove-fit-macro.patch b43-replace-limit_value-macro-with-clamp_val.patch b43legacy-replace-limit_value-macro-with-clamp_val.patch fuse-use-clamp-rather-than-nested-min-max.patch ide-tape-use-clamp_t-rather-than-nested-min_t-max_t.patch input-ff-memlessc-use-clamp_val-macro.patch dccp-ccid2c-ccid3c-use-clamp-clamp_t.patch drivers-replace-remaining-__function__-occurrences.patch kernel-add-common-infrastructure-for-unaligned-access.patch kernel-move-arches-to-use-common-unaligned-access.patch drivers-block-use-get_unaligned_-helpers.patch hid-core-use-get_unaligned_-helpers.patch char-use-get_unaligned_-helpers.patch input-use-get_unaligned_-helpers.patch mmc-use-get-put_unaligned_-helpers.patch net-use-get-put_unaligned_-helpers.patch wireless-use-get-put_unaligned_-helpers.patch pcmcia-use-get-put_unaligned_-helpers.patch usb-use-get-put_unaligned_-helpers.patch video-use-get-put_unaligned_-helpers.patch fat-use-get-put_unaligned_-helpers.patch hfsplus-use-get-put_unaligned_-helpers.patch isofs-use-get-put_unaligned_-helpers.patch ncpfs-use-get-put_unaligned_-helpers.patch ncpfs-use-get-put_unaligned_-helpers-checkpatch-fixes.patch mm-remove-remaining-__function__-occurances.patch block-remove-remaining-__function__-occurances.patch kernel-replace-remaining-__function__-occurances.patch lib-replace-remaining-__function__-occurances.patch afs-replace-remaining-__function__-occurrences.patch fs-replace-remaining-__function__-occurrences.patch drivers-char-replace-remaining-__function__-occurrences.patch serial-replace-remaining-__function__-occurrences.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html