aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 15:19:06 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 15:19:06 -0700
commitb8c638acacfe32c0bde361916467af00691f1965 (patch)
treea5655f484fa731d5ffd49c284f0372c4e055d144 /fs
parentef9efe43f2eddabee1e78a90c7c8451505bf05e1 (diff)
parent8e1c091cccd551557d24ce845715e8ceb6c49d36 (diff)
Merge branch 'uninit-var' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'uninit-var' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: arch/i386/* fs/* ipc/*: mark variables with uninitialized_var() drivers/*: mark variables with uninitialized_var()
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/file.c3
-rw-r--r--fs/udf/super.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index f04c7aa834c..004c2abbc73 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -1867,7 +1867,8 @@ static ssize_t ocfs2_file_buffered_write(struct file *file, loff_t *ppos,
loff_t pos;
const struct iovec *cur_iov = iov;
struct page *user_page, *page;
- char *buf, *dst;
+ char * uninitialized_var(buf);
+ char *dst;
void *fsdata;
/*
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 6658afb41cc..d6a504f5d75 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1356,7 +1356,7 @@ udf_load_partition(struct super_block *sb, kernel_lb_addr *fileset)
case UDF_VIRTUAL_MAP15:
case UDF_VIRTUAL_MAP20:
{
- kernel_lb_addr ino;
+ kernel_lb_addr uninitialized_var(ino);
if (!UDF_SB_LASTBLOCK(sb))
{