aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-28 05:16:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:46 -0400
commit78e917d59c30c3d5a4cda7f47e0f40f1c98f9b02 (patch)
tree43efd776befcc6164b31c6fa817449830932d7c1
parent36a53ddf859b0a9aa56e2e72978997bf68eec37a (diff)
udf: fix sparse warning in namei.c
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@gmail.com> Cc: Jan Kara <jack@ucw.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/udf/namei.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index ba5537d4bc15..2b34c8ca6c83 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -890,7 +890,7 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry,
890 890
891 if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) { 891 if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) {
892 kernel_lb_addr eloc; 892 kernel_lb_addr eloc;
893 uint32_t elen; 893 uint32_t bsize;
894 894
895 block = udf_new_block(inode->i_sb, inode, 895 block = udf_new_block(inode->i_sb, inode,
896 iinfo->i_location.partitionReferenceNum, 896 iinfo->i_location.partitionReferenceNum,
@@ -903,9 +903,9 @@ static int udf_symlink(struct inode *dir, struct dentry *dentry,
903 eloc.logicalBlockNum = block; 903 eloc.logicalBlockNum = block;
904 eloc.partitionReferenceNum = 904 eloc.partitionReferenceNum =
905 iinfo->i_location.partitionReferenceNum; 905 iinfo->i_location.partitionReferenceNum;
906 elen = inode->i_sb->s_blocksize; 906 bsize = inode->i_sb->s_blocksize;
907 iinfo->i_lenExtents = elen; 907 iinfo->i_lenExtents = bsize;
908 udf_add_aext(inode, &epos, eloc, elen, 0); 908 udf_add_aext(inode, &epos, eloc, bsize, 0);
909 brelse(epos.bh); 909 brelse(epos.bh);
910 910
911 block = udf_get_pblock(inode->i_sb, block, 911 block = udf_get_pblock(inode->i_sb, block,