diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2011-05-24 20:13:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 11:39:56 -0400 |
commit | 2a5cac17c06f897537f91f0040b3d3c8177f6433 (patch) | |
tree | c0f9340b36f04dc1baa5dc7cac4a32a5df696366 /fs/ncpfs | |
parent | 0fccc6221821e07366aa44bca112c4edb6d04dd7 (diff) |
fs/ncpfs/inode.c: suppress used-uninitialised warning
We get this spurious warning:
fs/ncpfs/inode.c: In function 'ncp_fill_super':
fs/ncpfs/inode.c:451: warning: 'data.mounted_vol[1u]' may be used uninitialized in this function
fs/ncpfs/inode.c:451: warning: 'data.mounted_vol[2u]' may be used uninitialized in this function
fs/ncpfs/inode.c:451: warning: 'data.mounted_vol[3u]' may be used uninitialized in this function
...
It's notabug, but we can easily fix it with a memset().
Reported-by: Harry Wei <jiaweiwei.xiyou@gmail.com>
Cc: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ncpfs')
-rw-r--r-- | fs/ncpfs/inode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 0250e4ce4893..202f370526a7 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c | |||
@@ -461,7 +461,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) | |||
461 | #endif | 461 | #endif |
462 | struct ncp_entry_info finfo; | 462 | struct ncp_entry_info finfo; |
463 | 463 | ||
464 | data.wdog_pid = NULL; | 464 | memset(&data, 0, sizeof(data)); |
465 | server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL); | 465 | server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL); |
466 | if (!server) | 466 | if (!server) |
467 | return -ENOMEM; | 467 | return -ENOMEM; |
@@ -496,7 +496,6 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) | |||
496 | struct ncp_mount_data_v4* md = (struct ncp_mount_data_v4*)raw_data; | 496 | struct ncp_mount_data_v4* md = (struct ncp_mount_data_v4*)raw_data; |
497 | 497 | ||
498 | data.flags = md->flags; | 498 | data.flags = md->flags; |
499 | data.int_flags = 0; | ||
500 | data.mounted_uid = md->mounted_uid; | 499 | data.mounted_uid = md->mounted_uid; |
501 | data.wdog_pid = find_get_pid(md->wdog_pid); | 500 | data.wdog_pid = find_get_pid(md->wdog_pid); |
502 | data.ncp_fd = md->ncp_fd; | 501 | data.ncp_fd = md->ncp_fd; |
@@ -507,7 +506,6 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent) | |||
507 | data.file_mode = md->file_mode; | 506 | data.file_mode = md->file_mode; |
508 | data.dir_mode = md->dir_mode; | 507 | data.dir_mode = md->dir_mode; |
509 | data.info_fd = -1; | 508 | data.info_fd = -1; |
510 | data.mounted_vol[0] = 0; | ||
511 | } | 509 | } |
512 | break; | 510 | break; |
513 | default: | 511 | default: |