Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 833d304b authored by James Lamanna's avatar James Lamanna Committed by Linus Torvalds
Browse files

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



Signed-off-by: default avatarJames Lamanna <jlamanna@gmail.com>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent aaa4059b

fs/reiserfs/super.c

+9 −16
Original line number Diff line number Diff line
@@ -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,8 +1154,7 @@ 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]) {

		for (i = 0; i < MAXQUOTAS; i++) {

			kfree(REISERFS_SB(s)->s_qf_names[i]);

			REISERFS_SB(s)->s_qf_names[i] = NULL;

		}
@@ -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]);

		sbi->s_qf_names[j] = NULL;

	}

#endif

	if (sbi != NULL) {

	kfree(sbi);

	}



	s->s_fs_info = NULL;

	return errval;

fs/reiserfs/xattr_acl.c

+1 −2
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ reiserfs_set_acl(struct inode *inode, int type, struct posix_acl *acl) 
		}

	}



	if (value)

	kfree(value);



	if (!error) {