mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 10:58:48 +09:00
fs/ntfs3: Use kvfree to free memory allocated by kvmalloc
commit ddb17dc880eeaac37b5a6e984de07b882de7d78d upstream. Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
bc08f5ab11
commit
742dcbc47a
@@ -29,7 +29,7 @@ static inline bool al_is_valid_le(const struct ntfs_inode *ni,
|
|||||||
void al_destroy(struct ntfs_inode *ni)
|
void al_destroy(struct ntfs_inode *ni)
|
||||||
{
|
{
|
||||||
run_close(&ni->attr_list.run);
|
run_close(&ni->attr_list.run);
|
||||||
kfree(ni->attr_list.le);
|
kvfree(ni->attr_list.le);
|
||||||
ni->attr_list.le = NULL;
|
ni->attr_list.le = NULL;
|
||||||
ni->attr_list.size = 0;
|
ni->attr_list.size = 0;
|
||||||
ni->attr_list.dirty = false;
|
ni->attr_list.dirty = false;
|
||||||
@@ -318,7 +318,7 @@ int al_add_le(struct ntfs_inode *ni, enum ATTR_TYPE type, const __le16 *name,
|
|||||||
memcpy(ptr, al->le, off);
|
memcpy(ptr, al->le, off);
|
||||||
memcpy(Add2Ptr(ptr, off + sz), le, old_size - off);
|
memcpy(Add2Ptr(ptr, off + sz), le, old_size - off);
|
||||||
le = Add2Ptr(ptr, off);
|
le = Add2Ptr(ptr, off);
|
||||||
kfree(al->le);
|
kvfree(al->le);
|
||||||
al->le = ptr;
|
al->le = ptr;
|
||||||
} else {
|
} else {
|
||||||
memmove(Add2Ptr(le, sz), le, old_size - off);
|
memmove(Add2Ptr(le, sz), le, old_size - off);
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ void wnd_close(struct wnd_bitmap *wnd)
|
|||||||
{
|
{
|
||||||
struct rb_node *node, *next;
|
struct rb_node *node, *next;
|
||||||
|
|
||||||
kfree(wnd->free_bits);
|
kvfree(wnd->free_bits);
|
||||||
run_close(&wnd->run);
|
run_close(&wnd->run);
|
||||||
|
|
||||||
node = rb_first(&wnd->start_tree);
|
node = rb_first(&wnd->start_tree);
|
||||||
@@ -1333,7 +1333,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)
|
|||||||
memcpy(new_free, wnd->free_bits, wnd->nwnd * sizeof(short));
|
memcpy(new_free, wnd->free_bits, wnd->nwnd * sizeof(short));
|
||||||
memset(new_free + wnd->nwnd, 0,
|
memset(new_free + wnd->nwnd, 0,
|
||||||
(new_wnd - wnd->nwnd) * sizeof(short));
|
(new_wnd - wnd->nwnd) * sizeof(short));
|
||||||
kfree(wnd->free_bits);
|
kvfree(wnd->free_bits);
|
||||||
wnd->free_bits = new_free;
|
wnd->free_bits = new_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -773,7 +773,7 @@ static int ni_try_remove_attr_list(struct ntfs_inode *ni)
|
|||||||
run_deallocate(sbi, &ni->attr_list.run, true);
|
run_deallocate(sbi, &ni->attr_list.run, true);
|
||||||
run_close(&ni->attr_list.run);
|
run_close(&ni->attr_list.run);
|
||||||
ni->attr_list.size = 0;
|
ni->attr_list.size = 0;
|
||||||
kfree(ni->attr_list.le);
|
kvfree(ni->attr_list.le);
|
||||||
ni->attr_list.le = NULL;
|
ni->attr_list.le = NULL;
|
||||||
ni->attr_list.dirty = false;
|
ni->attr_list.dirty = false;
|
||||||
|
|
||||||
@@ -924,7 +924,7 @@ int ni_create_attr_list(struct ntfs_inode *ni)
|
|||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
out1:
|
out1:
|
||||||
kfree(ni->attr_list.le);
|
kvfree(ni->attr_list.le);
|
||||||
ni->attr_list.le = NULL;
|
ni->attr_list.le = NULL;
|
||||||
ni->attr_list.size = 0;
|
ni->attr_list.size = 0;
|
||||||
return err;
|
return err;
|
||||||
|
|||||||
@@ -441,7 +441,7 @@ static noinline void put_ntfs(struct ntfs_sb_info *sbi)
|
|||||||
{
|
{
|
||||||
kfree(sbi->new_rec);
|
kfree(sbi->new_rec);
|
||||||
kvfree(ntfs_put_shared(sbi->upcase));
|
kvfree(ntfs_put_shared(sbi->upcase));
|
||||||
kfree(sbi->def_table);
|
kvfree(sbi->def_table);
|
||||||
|
|
||||||
wnd_close(&sbi->mft.bitmap);
|
wnd_close(&sbi->mft.bitmap);
|
||||||
wnd_close(&sbi->used.bitmap);
|
wnd_close(&sbi->used.bitmap);
|
||||||
|
|||||||
Reference in New Issue
Block a user