aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-28 02:16:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 08:58:46 -0700
commit78e917d59c30c3d5a4cda7f47e0f40f1c98f9b02 (patch)
tree43efd776befcc6164b31c6fa817449830932d7c1
parent36a53ddf859b0a9aa56e2e72978997bf68eec37a (diff)
downloadmrst-s0i3-test-78e917d59c30c3d5a4cda7f47e0f40f1c98f9b02.tar.gz
mrst-s0i3-test-78e917d59c30c3d5a4cda7f47e0f40f1c98f9b02.tar.xz
mrst-s0i3-test-78e917d59c30c3d5a4cda7f47e0f40f1c98f9b02.zip
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 ba5537d4bc1..2b34c8ca6c8 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,
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, struct dentry *dentry,
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,