leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] reiserfs: [kv]free() checking cleanup

Browse Source 
Signed-off-by: James Lamanna <jlamanna@gmail.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
James Lamanna 2005-10-30 15:00:16 -08:00 committed by Linus Torvalds
parent aaa4059bc2
commit 833d304b22
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fs/reiserfs/super.c
View File

@ -1024,12 +1024,8 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin
strcpy(REISERFS_SB(s)->s_qf_names[qtype], arg);
*mount_options |= 1 << REISERFS_QUOTA;
} else {
if (REISERFS_SB(s)->s_qf_names[qtype]) {
kfree(REISERFS_SB(s)->
s_qf_names[qtype]);
REISERFS_SB(s)->s_qf_names[qtype] =
NULL;
}
kfree(REISERFS_SB(s)->s_qf_names[qtype]);
REISERFS_SB(s)->s_qf_names[qtype] = NULL;
}
}
if (c == 'f') {
@ -1158,11 +1154,10 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
if (!reiserfs_parse_options
(s, arg, &mount_options, &blocks, NULL, &commit_max_age)) {
#ifdef CONFIG_QUOTA
for (i = 0; i < MAXQUOTAS; i++)
if (REISERFS_SB(s)->s_qf_names[i]) {
kfree(REISERFS_SB(s)->s_qf_names[i]);
REISERFS_SB(s)->s_qf_names[i] = NULL;
}
for (i = 0; i < MAXQUOTAS; i++) {
kfree(REISERFS_SB(s)->s_qf_names[i]);
REISERFS_SB(s)->s_qf_names[i] = NULL;
}
#endif
return -EINVAL;
}
@ -1940,13 +1935,11 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
brelse(SB_BUFFER_WITH_SB(s));
#ifdef CONFIG_QUOTA
for (j = 0; j < MAXQUOTAS; j++) {
if (sbi->s_qf_names[j])
kfree(sbi->s_qf_names[j]);
kfree(sbi->s_qf_names[j]);
sbi->s_qf_names[j] = NULL;
}
#endif
if (sbi != NULL) {
kfree(sbi);
}
kfree(sbi);
s->s_fs_info = NULL;
return errval;

3
fs/reiserfs/xattr_acl.c
View File

@ -296,8 +296,7 @@ reiserfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
}
}
if (value)
kfree(value);
kfree(value);
if (!error) {
/* Release the old one */