Unverified Commit fc471e39 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Use kvmalloc instead of kmalloc(... __GFP_NOWARN) 



Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 06ccfb00

fs/ntfs3/attrlist.c

+13 −2
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ int ntfs_load_attr_list(struct ntfs_inode *ni, struct ATTRIB *attr) 


	if (!attr->non_res) {

		lsize = le32_to_cpu(attr->res.data_size);

		le = kmalloc(al_aligned(lsize), GFP_NOFS | __GFP_NOWARN);

		/* attr is resident: lsize < record_size (1K or 4K) */

		le = kvmalloc(al_aligned(lsize), GFP_KERNEL);

		if (!le) {

			err = -ENOMEM;

			goto out;
@@ -80,7 +81,17 @@ int ntfs_load_attr_list(struct ntfs_inode *ni, struct ATTRIB *attr) 
		if (err < 0)

			goto out;



		le = kmalloc(al_aligned(lsize), GFP_NOFS | __GFP_NOWARN);

		/* attr is nonresident.

		 * The worst case:

		 * 1T (2^40) extremely fragmented file.

		 * cluster = 4K (2^12) => 2^28 fragments

		 * 2^9 fragments per one record => 2^19 records

		 * 2^5 bytes of ATTR_LIST_ENTRY per one record => 2^24 bytes.

		 *

		 * the result is 16M bytes per attribute list.

		 * Use kvmalloc to allocate in range [several Kbytes - dozen Mbytes]

		 */

		le = kvmalloc(al_aligned(lsize), GFP_KERNEL);

		if (!le) {

			err = -ENOMEM;

			goto out;

fs/ntfs3/bitmap.c

+2 −1
Original line number Diff line number Diff line
@@ -659,7 +659,8 @@ int wnd_init(struct wnd_bitmap *wnd, struct super_block *sb, size_t nbits) 
		wnd->bits_last = wbits;



	wnd->free_bits =

		kcalloc(wnd->nwnd, sizeof(u16), GFP_NOFS | __GFP_NOWARN);

		kvmalloc_array(wnd->nwnd, sizeof(u16), GFP_KERNEL | __GFP_ZERO);



	if (!wnd->free_bits)

		return -ENOMEM;

fs/ntfs3/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1367,7 +1367,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) 
	}



	bytes = inode->i_size;

	sbi->def_table = t = kmalloc(bytes, GFP_NOFS | __GFP_NOWARN);

	sbi->def_table = t = kvmalloc(bytes, GFP_KERNEL);

	if (!t) {

		err = -ENOMEM;

		goto put_inode_out;