From 195c52bdd5d5ecfdabf5a7c6159efe299e534f84 Mon Sep 17 00:00:00 2001

From: Kari Argillander <kari.argillander@gmail.com>

Date: Tue, 24 Aug 2021 21:37:07 +0300

Subject: [Backport 195c52bdd5d5] src: Do not use driver own alloc

 wrappers

Problem with these wrapper is that we cannot take off example GFP_NOFS

flag. It is not recomended use those in all places. Also if we change

one driver specific wrapper to kernel wrapper then it would look really

weird. People should be most familiar with kernel wrappers so let's just

use those ones.

Driver specific alloc wrapper also confuse some static analyzing tools,

good example is example kernels checkpatch tool. After we converter

these to kernel specific then warnings is showed.

Following Coccinelle script was used to automate changing.

virtual patch

@alloc depends on patch@

expression x;

expression y;

@@

(

-	ntfs_malloc(x)

+	kmalloc(x, GFP_NOFS)

|

-	ntfs_zalloc(x)

+	kzalloc(x, GFP_NOFS)

|

-	ntfs_vmalloc(x)

+	kvmalloc(x, GFP_NOFS)

|

-	ntfs_free(x)

+	kfree(x)

|

-	ntfs_vfree(x)

+	kvfree(x)

|

-	ntfs_memdup(x, y)

+	kmemdup(x, y, GFP_NOFS)

)

Reviewed-by: Christoph Hellwig <hch@lst.de>

Signed-off-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/attrib.c   |   6 +-

 src/attrlist.c |  10 +--

 src/bitmap.c   |   8 +--

 src/debug.h    |   7 --

 src/file.c     |   4 +-

 src/frecord.c  |  27 +++----

 src/fslog.c    | 172 ++++++++++++++++++++++----------------------

 src/fsntfs.c   |   8 +--

 src/index.c    |  54 +++++++-------

 src/inode.c    |  10 +--

 src/lznt.c     |   4 +-

 src/ntfs_fs.h  |  18 ++---

 src/record.c   |   8 +--

 src/run.c      |   8 +--

 src/super.c    |  20 +++---

 src/xattr.c    |  18 ++---

 16 files changed, 188 insertions(+), 194 deletions(-)

diff --git a/src/attrib.c b/src/attrib.c

index c15467ec12ed88ad05390fb57a47f396d4391f3e..4eae9886e27d0f481671c4b40c22a3742d794e4f 100644

--- a/src/attrib.c

+++ b/src/attrib.c

@@ -276,7 +276,7 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr,

 	run_init(run);

 	/* make a copy of original attribute */

-	attr_s = ntfs_memdup(attr, asize);

+	attr_s = kmemdup(attr, asize, GFP_NOFS);

 	if (!attr_s) {

 		err = -ENOMEM;

 		goto out;

@@ -333,7 +333,7 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr,

 	if (err)

 		goto out3;

-	ntfs_free(attr_s);

+	kfree(attr_s);

 	attr->nres.data_size = cpu_to_le64(rsize);

 	attr->nres.valid_size = attr->nres.data_size;

@@ -356,7 +356,7 @@ int attr_make_nonresident(struct ntfs_inode *ni, struct ATTRIB *attr,

 	run_deallocate(sbi, run, false);

 	run_close(run);

 out1:

-	ntfs_free(attr_s);

+	kfree(attr_s);

 	/*reinsert le*/

 out:

 	return err;

diff --git a/src/attrlist.c b/src/attrlist.c

index ea561361b576d5a8a1ec30c0017a5ac76f1a61df..348bfb54db09f364f64182f51468f6cceb12e37d 100644

--- a/src/attrlist.c

+++ b/src/attrlist.c

@@ -28,7 +28,7 @@ static inline bool al_is_valid_le(const struct ntfs_inode *ni,

 void al_destroy(struct ntfs_inode *ni)

 {

 	run_close(&ni->attr_list.run);

-	ntfs_free(ni->attr_list.le);

+	kfree(ni->attr_list.le);

 	ni->attr_list.le = NULL;

 	ni->attr_list.size = 0;

 	ni->attr_list.dirty = false;

@@ -51,7 +51,7 @@ 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 = ntfs_malloc(al_aligned(lsize));

+		le = kmalloc(al_aligned(lsize), GFP_NOFS);

 		if (!le) {

 			err = -ENOMEM;

 			goto out;

@@ -74,7 +74,7 @@ int ntfs_load_attr_list(struct ntfs_inode *ni, struct ATTRIB *attr)

 		if (err < 0)

 			goto out;

-		le = ntfs_malloc(al_aligned(lsize));

+		le = kmalloc(al_aligned(lsize), GFP_NOFS);

 		if (!le) {

 			err = -ENOMEM;

 			goto out;

@@ -289,7 +289,7 @@ int al_add_le(struct ntfs_inode *ni, enum ATTR_TYPE type, const __le16 *name,

 	off = PtrOffset(al->le, le);

 	if (new_size > asize) {

-		void *ptr = ntfs_malloc(new_asize);

+		void *ptr = kmalloc(new_asize, GFP_NOFS);

 		if (!ptr)

 			return -ENOMEM;

@@ -297,7 +297,7 @@ int al_add_le(struct ntfs_inode *ni, enum ATTR_TYPE type, const __le16 *name,

 		memcpy(ptr, al->le, off);

 		memcpy(Add2Ptr(ptr, off + sz), le, al->size - off);

 		le = Add2Ptr(ptr, off);

-		ntfs_free(al->le);

+		kfree(al->le);

 		al->le = ptr;

 	} else {

 		memmove(Add2Ptr(le, sz), le, al->size - off);

diff --git a/src/bitmap.c b/src/bitmap.c

index 32aab0031221db3ee67b09c239b960158370d238..d502bba323d00e1ccafa7a0a0eeea46e0e36d796 100644

--- a/src/bitmap.c

+++ b/src/bitmap.c

@@ -133,7 +133,7 @@ void wnd_close(struct wnd_bitmap *wnd)

 {

 	struct rb_node *node, *next;

-	ntfs_free(wnd->free_bits);

+	kfree(wnd->free_bits);

 	run_close(&wnd->run);

 	node = rb_first(&wnd->start_tree);

@@ -683,7 +683,7 @@ int wnd_init(struct wnd_bitmap *wnd, struct super_block *sb, size_t nbits)

 	if (!wnd->bits_last)

 		wnd->bits_last = wbits;

-	wnd->free_bits = ntfs_zalloc(wnd->nwnd * sizeof(u16));

+	wnd->free_bits = kzalloc(wnd->nwnd * sizeof(u16), GFP_NOFS);

 	if (!wnd->free_bits)

 		return -ENOMEM;

@@ -1354,7 +1354,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)

 		new_last = wbits;

 	if (new_wnd != wnd->nwnd) {

-		new_free = ntfs_malloc(new_wnd * sizeof(u16));

+		new_free = kmalloc(new_wnd * sizeof(u16), GFP_NOFS);

 		if (!new_free)

 			return -ENOMEM;

@@ -1363,7 +1363,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits)

 			       wnd->nwnd * sizeof(short));

 		memset(new_free + wnd->nwnd, 0,

 		       (new_wnd - wnd->nwnd) * sizeof(short));

-		ntfs_free(wnd->free_bits);

+		kfree(wnd->free_bits);

 		wnd->free_bits = new_free;

 	}

diff --git a/src/debug.h b/src/debug.h

index aff4cead9f58ff3222d68d54d853808f0e17a6dc..c8403e876b2dc522520921c58fa230a4df4e04d1 100644

--- a/src/debug.h

+++ b/src/debug.h

@@ -47,12 +47,5 @@ void ntfs_inode_printk(struct inode *inode, const char *fmt, ...)

 #define ntfs_inode_warn(inode, fmt, ...)                                       \

 	ntfs_inode_printk(inode, KERN_WARNING fmt, ##__VA_ARGS__)

-#define ntfs_malloc(s)		kmalloc(s, GFP_NOFS)

-#define ntfs_zalloc(s)		kzalloc(s, GFP_NOFS)

-#define ntfs_vmalloc(s)		kvmalloc(s, GFP_KERNEL)

-#define ntfs_free(p)		kfree(p)

-#define ntfs_vfree(p)		kvfree(p)

-#define ntfs_memdup(src, len)	kmemdup(src, len, GFP_NOFS)

-

 #endif /* _LINUX_NTFS3_DEBUG_H */

 // clang-format on

diff --git a/src/file.c b/src/file.c

index 59344985c2e8017d67cfba642d1bacaa676b3f24..8d27c520bec56a1daca965fba7ba826049b18709 100644

--- a/src/file.c

+++ b/src/file.c

@@ -900,7 +900,7 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)

 		return -EOPNOTSUPP;

 	}

-	pages = ntfs_malloc(pages_per_frame * sizeof(struct page *));

+	pages = kmalloc(pages_per_frame * sizeof(struct page *), GFP_NOFS);

 	if (!pages)

 		return -ENOMEM;

@@ -1076,7 +1076,7 @@ static ssize_t ntfs_compress_write(struct kiocb *iocb, struct iov_iter *from)

 	}

 out:

-	ntfs_free(pages);

+	kfree(pages);

 	current->backing_dev_info = NULL;

diff --git a/src/frecord.c b/src/frecord.c

index 8e2242147ebfcdc4bea3cf19d79276725f09be9b..2f7d165435307dc37dfbc6ba7959f04c1b218257 100644

--- a/src/frecord.c

+++ b/src/frecord.c

@@ -388,7 +388,7 @@ bool ni_add_subrecord(struct ntfs_inode *ni, CLST rno, struct mft_inode **mi)

 {

 	struct mft_inode *m;

-	m = ntfs_zalloc(sizeof(struct mft_inode));

+	m = kzalloc(sizeof(struct mft_inode), GFP_NOFS);

 	if (!m)

 		return false;

@@ -752,7 +752,7 @@ static int ni_try_remove_attr_list(struct ntfs_inode *ni)

 	run_deallocate(sbi, &ni->attr_list.run, true);

 	run_close(&ni->attr_list.run);

 	ni->attr_list.size = 0;

-	ntfs_free(ni->attr_list.le);

+	kfree(ni->attr_list.le);

 	ni->attr_list.le = NULL;

 	ni->attr_list.dirty = false;

@@ -787,7 +787,7 @@ int ni_create_attr_list(struct ntfs_inode *ni)

 	 * Skip estimating exact memory requirement

 	 * Looks like one record_size is always enough

 	 */

-	le = ntfs_malloc(al_aligned(rs));

+	le = kmalloc(al_aligned(rs), GFP_NOFS);

 	if (!le) {

 		err = -ENOMEM;

 		goto out;

@@ -893,7 +893,7 @@ int ni_create_attr_list(struct ntfs_inode *ni)

 	goto out;

 out1:

-	ntfs_free(ni->attr_list.le);

+	kfree(ni->attr_list.le);

 	ni->attr_list.le = NULL;

 	ni->attr_list.size = 0;

@@ -2054,7 +2054,7 @@ int ni_readpage_cmpr(struct ntfs_inode *ni, struct page *page)

 	idx = (vbo - frame_vbo) >> PAGE_SHIFT;

 	pages_per_frame = frame_size >> PAGE_SHIFT;

-	pages = ntfs_zalloc(pages_per_frame * sizeof(struct page *));

+	pages = kzalloc(pages_per_frame * sizeof(struct page *), GFP_NOFS);

 	if (!pages) {

 		err = -ENOMEM;

 		goto out;

@@ -2092,7 +2092,7 @@ int ni_readpage_cmpr(struct ntfs_inode *ni, struct page *page)

 out:

 	/* At this point, err contains 0 or -EIO depending on the "critical" page */

-	ntfs_free(pages);

+	kfree(pages);

 	unlock_page(page);

 	return err;

@@ -2137,7 +2137,7 @@ int ni_decompress_file(struct ntfs_inode *ni)

 	frame_bits = ni_ext_compress_bits(ni);

 	frame_size = 1u << frame_bits;

 	pages_per_frame = frame_size >> PAGE_SHIFT;

-	pages = ntfs_zalloc(pages_per_frame * sizeof(struct page *));

+	pages = kzalloc(pages_per_frame * sizeof(struct page *), GFP_NOFS);

 	if (!pages) {

 		err = -ENOMEM;

 		goto out;

@@ -2298,7 +2298,7 @@ int ni_decompress_file(struct ntfs_inode *ni)

 	mapping->a_ops = &ntfs_aops;

 out:

-	ntfs_free(pages);

+	kfree(pages);

 	if (err) {

 		make_bad_inode(inode);

 		ntfs_set_state(sbi, NTFS_DIRTY_ERROR);

@@ -2564,7 +2564,7 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,

 		goto out1;

 	}

-	pages_disk = ntfs_zalloc(npages_disk * sizeof(struct page *));

+	pages_disk = kzalloc(npages_disk * sizeof(struct page *), GFP_NOFS);

 	if (!pages_disk) {

 		err = -ENOMEM;

 		goto out2;

@@ -2633,7 +2633,7 @@ int ni_read_frame(struct ntfs_inode *ni, u64 frame_vbo, struct page **pages,

 			put_page(pg);

 		}

 	}

-	ntfs_free(pages_disk);

+	kfree(pages_disk);

 out2:

 #ifdef CONFIG_NTFS3_LZX_XPRESS

@@ -2709,7 +2709,8 @@ int ni_write_frame(struct ntfs_inode *ni, struct page **pages,

 		goto out;

 	}

-	pages_disk = ntfs_zalloc(pages_per_frame * sizeof(struct page *));

+	pages_disk = kzalloc(pages_per_frame * sizeof(struct page *),

+			     GFP_NOFS);

 	if (!pages_disk) {

 		err = -ENOMEM;

 		goto out;

@@ -2769,7 +2770,7 @@ int ni_write_frame(struct ntfs_inode *ni, struct page **pages,

 	compr_size = compress_lznt(frame_mem, frame_size, frame_ondisk,

 				   frame_size, sbi->compress.lznt);

 	mutex_unlock(&sbi->compress.mtx_lznt);

-	ntfs_free(lznt);

+	kfree(lznt);

 	if (compr_size + sbi->cluster_size > frame_size) {

 		/* frame is not compressed */

@@ -2818,7 +2819,7 @@ int ni_write_frame(struct ntfs_inode *ni, struct page **pages,

 			put_page(pg);

 		}

 	}

-	ntfs_free(pages_disk);

+	kfree(pages_disk);

 out:

 	return err;

 }

diff --git a/src/fslog.c b/src/fslog.c

index 5a118c351441cc2deca390c49cfd87d75f3e587b..2c213b55979ed06c03f4e74998fd03f9a9a8827b 100644

--- a/src/fslog.c

+++ b/src/fslog.c

@@ -406,9 +406,9 @@ struct lcb {

 static void lcb_put(struct lcb *lcb)

 {

 	if (lcb->alloc)

-		ntfs_free(lcb->log_rec);

-	ntfs_free(lcb->lrh);

-	ntfs_free(lcb);

+		kfree(lcb->log_rec);

+	kfree(lcb->lrh);

+	kfree(lcb);

 }

 /*

@@ -807,7 +807,7 @@ static inline struct RESTART_TABLE *init_rsttbl(u16 esize, u16 used)

 	u32 off;

 	u32 bytes = esize * used + sizeof(struct RESTART_TABLE);

 	u32 lf = sizeof(struct RESTART_TABLE) + (used - 1) * esize;

-	struct RESTART_TABLE *t = ntfs_zalloc(bytes);

+	struct RESTART_TABLE *t = kzalloc(bytes, GFP_NOFS);

 	t->size = cpu_to_le16(esize);

 	t->used = cpu_to_le16(used);

@@ -849,7 +849,7 @@ static inline struct RESTART_TABLE *extend_rsttbl(struct RESTART_TABLE *tbl,

 	rt->total = tbl->total;

-	ntfs_free(tbl);

+	kfree(tbl);

 	return rt;

 }

@@ -1134,7 +1134,7 @@ static int read_log_page(struct ntfs_log *log, u32 vbo,

 		return -EINVAL;

 	if (!*buffer) {

-		to_free = ntfs_malloc(bytes);

+		to_free = kmalloc(bytes, GFP_NOFS);

 		if (!to_free)

 			return -ENOMEM;

 		*buffer = to_free;

@@ -1164,7 +1164,7 @@ static int read_log_page(struct ntfs_log *log, u32 vbo,

 out:

 	if (err && to_free) {

-		ntfs_free(to_free);

+		kfree(to_free);

 		*buffer = NULL;

 	}

@@ -1181,7 +1181,7 @@ static int log_read_rst(struct ntfs_log *log, u32 l_size, bool first,

 			struct restart_info *info)

 {

 	u32 skip, vbo;

-	struct RESTART_HDR *r_page = ntfs_malloc(DefaultLogPageSize);

+	struct RESTART_HDR *r_page = kmalloc(DefaultLogPageSize, GFP_NOFS);

 	if (!r_page)

 		return -ENOMEM;

@@ -1257,8 +1257,8 @@ static int log_read_rst(struct ntfs_log *log, u32 l_size, bool first,

 		/* Read the entire restart area */

 		sys_page_size = le32_to_cpu(r_page->sys_page_size);

 		if (DefaultLogPageSize != sys_page_size) {

-			ntfs_free(r_page);

-			r_page = ntfs_zalloc(sys_page_size);

+			kfree(r_page);

+			r_page = kzalloc(sys_page_size, GFP_NOFS);

 			if (!r_page)

 				return -ENOMEM;

@@ -1266,7 +1266,7 @@ static int log_read_rst(struct ntfs_log *log, u32 l_size, bool first,

 					  (struct RECORD_PAGE_HDR **)&r_page,

 					  &usa_error)) {

 				/* ignore any errors */

-				ntfs_free(r_page);

+				kfree(r_page);

 				r_page = NULL;

 				continue;

 			}

@@ -1296,7 +1296,7 @@ static int log_read_rst(struct ntfs_log *log, u32 l_size, bool first,

 		}

 	}

-	ntfs_free(r_page);

+	kfree(r_page);

 	return 0;

 }

@@ -1397,7 +1397,7 @@ static void log_create(struct ntfs_log *log, u32 l_size, const u64 last_lsn,

 static struct RESTART_AREA *log_create_ra(struct ntfs_log *log)

 {

 	struct CLIENT_REC *cr;

-	struct RESTART_AREA *ra = ntfs_zalloc(log->restart_size);

+	struct RESTART_AREA *ra = kzalloc(log->restart_size, GFP_NOFS);

 	if (!ra)

 		return NULL;

@@ -1509,7 +1509,7 @@ static int next_log_lsn(struct ntfs_log *log, const struct LFS_RECORD_HDR *rh,

 	if (!is_lsn_in_file(log, *lsn))

 		*lsn = 0;

-	ntfs_free(page);

+	kfree(page);

 	return 0;

 }

@@ -1634,7 +1634,7 @@ static int last_log_lsn(struct ntfs_log *log)

 		second_off = 0x12 * log->page_size;

 		// 0x10 == 0x12 - 0x2

-		page_bufs = ntfs_malloc(log->page_size * 0x10);

+		page_bufs = kmalloc(log->page_size * 0x10, GFP_NOFS);

 		if (!page_bufs)

 			return -ENOMEM;

 	} else {

@@ -1646,7 +1646,7 @@ static int last_log_lsn(struct ntfs_log *log)

 	/* Read second tail page (at pos 3/0x12000) */

 	if (read_log_page(log, second_off, &second_tail, &usa_error) ||

 	    usa_error || second_tail->rhdr.sign != NTFS_RCRD_SIGNATURE) {

-		ntfs_free(second_tail);

+		kfree(second_tail);

 		second_tail = NULL;

 		second_file_off = 0;

 		lsn2 = 0;

@@ -1658,7 +1658,7 @@ static int last_log_lsn(struct ntfs_log *log)

 	/* Read first tail page (at pos 2/0x2000 ) */

 	if (read_log_page(log, final_off, &first_tail, &usa_error) ||

 	    usa_error || first_tail->rhdr.sign != NTFS_RCRD_SIGNATURE) {

-		ntfs_free(first_tail);

+		kfree(first_tail);

 		first_tail = NULL;

 		first_file_off = 0;

 		lsn1 = 0;

@@ -1759,17 +1759,17 @@ static int last_log_lsn(struct ntfs_log *log)

 			page_pos = page_cnt = 1;

 		}

 	} else {

-		ntfs_free(first_tail);

-		ntfs_free(second_tail);

+		kfree(first_tail);

+		kfree(second_tail);

 		goto tail_read;

 	}

-	ntfs_free(first_tail_prev);

+	kfree(first_tail_prev);

 	first_tail_prev = first_tail;

 	final_off_prev = first_file_off;

 	first_tail = NULL;

-	ntfs_free(second_tail_prev);

+	kfree(second_tail_prev);

 	second_tail_prev = second_tail;

 	second_off_prev = second_file_off;

 	second_tail = NULL;

@@ -2030,7 +2030,7 @@ static int last_log_lsn(struct ntfs_log *log)

 	}

 	curpage_off = nextpage_off;

-	ntfs_free(page);

+	kfree(page);

 	page = NULL;

 	reuse_page = 0;

 	goto next_page;

@@ -2092,7 +2092,7 @@ static int last_log_lsn(struct ntfs_log *log)

 	cur_pos = 2;

 next_test_page:

-	ntfs_free(tst_page);

+	kfree(tst_page);

 	tst_page = NULL;

 	/* Walk through the file, reading log pages */

@@ -2151,7 +2151,7 @@ static int last_log_lsn(struct ntfs_log *log)

 	}

 	/* Call our routine to check this log page */

-	ntfs_free(tst_page);

+	kfree(tst_page);

 	tst_page = NULL;

 	err = read_log_page(log, nextpage_off, &tst_page, &usa_error);

@@ -2186,7 +2186,7 @@ static int last_log_lsn(struct ntfs_log *log)

 			u64 off = hdr_file_off(log, tmp_page);

 			if (!page) {

-				page = ntfs_malloc(log->page_size);

+				page = kmalloc(log->page_size, GFP_NOFS);

 				if (!page)

 					return -ENOMEM;

 			}

@@ -2231,11 +2231,11 @@ static int last_log_lsn(struct ntfs_log *log)

 	}

 out:

-	ntfs_free(second_tail);

-	ntfs_free(first_tail);

-	ntfs_free(page);

-	ntfs_free(tst_page);

-	ntfs_free(page_bufs);

+	kfree(second_tail);

+	kfree(first_tail);

+	kfree(page);

+	kfree(tst_page);

+	kfree(page_bufs);

 	return err;

 }

@@ -2311,7 +2311,7 @@ static int read_log_rec_buf(struct ntfs_log *log,

 	}

 out:

-	ntfs_free(ph);

+	kfree(ph);

 	return err;

 }

@@ -2360,7 +2360,7 @@ static int read_rst_area(struct ntfs_log *log, struct NTFS_RESTART **rst_,

 		goto out;

 	}

-	rst = ntfs_malloc(len);

+	rst = kmalloc(len, GFP_NOFS);

 	if (!rst) {

 		err = -ENOMEM;

 		goto out;

@@ -2375,8 +2375,8 @@ static int read_rst_area(struct ntfs_log *log, struct NTFS_RESTART **rst_,

 	rst = NULL;

 out:

-	ntfs_free(rh);

-	ntfs_free(rst);

+	kfree(rh);

+	kfree(rst);

 	return err;

 }

@@ -2419,7 +2419,7 @@ static int find_log_rec(struct ntfs_log *log, u64 lsn, struct lcb *lcb)

 	 * put a pointer to the log record the context block

 	 */

 	if (rh->flags & LOG_RECORD_MULTI_PAGE) {

-		void *lr = ntfs_malloc(len);

+		void *lr = kmalloc(len, GFP_NOFS);

 		if (!lr)

 			return -ENOMEM;

@@ -2472,7 +2472,7 @@ static int read_log_rec_lcb(struct ntfs_log *log, u64 lsn, u32 ctx_mode,

 	if (!verify_client_lsn(log, cr, lsn))

 		return -EINVAL;

-	lcb = ntfs_zalloc(sizeof(struct lcb));

+	lcb = kzalloc(sizeof(struct lcb), GFP_NOFS);

 	if (!lcb)

 		return -ENOMEM;

 	lcb->client = log->client_id;

@@ -2521,7 +2521,7 @@ static int find_client_next_lsn(struct ntfs_log *log, struct lcb *lcb, u64 *lsn)

 			break;

 		if (hdr != lcb->lrh)

-			ntfs_free(hdr);

+			kfree(hdr);

 		hdr = NULL;

 		err = read_log_page(log, lsn_to_vbo(log, current_lsn),

@@ -2533,7 +2533,7 @@ static int find_client_next_lsn(struct ntfs_log *log, struct lcb *lcb, u64 *lsn)

 			   sizeof(struct CLIENT_ID))) {

 			/*err = -EINVAL; */

 		} else if (LfsClientRecord == hdr->record_type) {

-			ntfs_free(lcb->lrh);

+			kfree(lcb->lrh);

 			lcb->lrh = hdr;

 			*lsn = current_lsn;

 			return 0;

@@ -2542,7 +2542,7 @@ static int find_client_next_lsn(struct ntfs_log *log, struct lcb *lcb, u64 *lsn)

 out:

 	if (hdr != lcb->lrh)

-		ntfs_free(hdr);

+		kfree(hdr);

 	return err;

 check_undo_next:

@@ -2566,7 +2566,7 @@ static int find_client_next_lsn(struct ntfs_log *log, struct lcb *lcb, u64 *lsn)

 			    (struct RECORD_PAGE_HDR **)&hdr, NULL);

 	if (err)

 		return err;

-	ntfs_free(lcb->lrh);

+	kfree(lcb->lrh);

 	lcb->lrh = hdr;

 	*lsn = next_lsn;

@@ -2586,11 +2586,11 @@ static int read_next_log_rec(struct ntfs_log *log, struct lcb *lcb, u64 *lsn)

 		return 0;

 	if (lcb->alloc)

-		ntfs_free(lcb->log_rec);

+		kfree(lcb->log_rec);

 	lcb->log_rec = NULL;

 	lcb->alloc = false;

-	ntfs_free(lcb->lrh);

+	kfree(lcb->lrh);

 	lcb->lrh = NULL;

 	return find_log_rec(log, *lsn, lcb);

@@ -2987,7 +2987,7 @@ static struct ATTRIB *attr_create_nonres_log(struct ntfs_sb_info *sbi,

 	u32 asize = name_size +

 		    (is_ext ? SIZEOF_NONRESIDENT_EX : SIZEOF_NONRESIDENT);

-	attr = ntfs_zalloc(asize);

+	attr = kzalloc(asize, GFP_NOFS);

 	if (!attr)

 		return NULL;

@@ -3087,7 +3087,7 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,

 		if (inode) {

 			mi = &ntfs_i(inode)->mi;

 		} else if (op == InitializeFileRecordSegment) {

-			mi = ntfs_zalloc(sizeof(struct mft_inode));

+			mi = kzalloc(sizeof(struct mft_inode), GFP_NOFS);

 			if (!mi)

 				return -ENOMEM;

 			err = mi_format_new(mi, sbi, rno, 0, false);

@@ -3181,7 +3181,7 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,

 		if (attr->type == ATTR_ALLOC)

 			bytes = (bytes + 511) & ~511; // align

-		buffer_le = ntfs_malloc(bytes);

+		buffer_le = kmalloc(bytes, GFP_NOFS);

 		if (!buffer_le)

 			return -ENOMEM;

@@ -3250,11 +3250,11 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,

 		oa2 = find_loaded_attr(log, attr, rno_base);

 		if (oa2) {

-			void *p2 = ntfs_memdup(attr, le32_to_cpu(attr->size));

-

+			void *p2 = kmemdup(attr, le32_to_cpu(attr->size),

+					   GFP_NOFS);

 			if (p2) {

 				// run_close(oa2->run1);

-				ntfs_free(oa2->attr);

+				kfree(oa2->attr);

 				oa2->attr = p2;

 			}

 		}

@@ -3317,12 +3317,12 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,

 		oa2 = find_loaded_attr(log, attr, rno_base);

 		if (oa2) {

-			void *p2 = ntfs_memdup(attr, le32_to_cpu(attr->size));

-

+			void *p2 = kmemdup(attr, le32_to_cpu(attr->size),

+					   GFP_NOFS);

 			if (p2) {

 				// run_close(&oa2->run0);

 				oa2->run1 = &oa2->run0;

-				ntfs_free(oa2->attr);

+				kfree(oa2->attr);

 				oa2->attr = p2;

 			}

 		}

@@ -3376,10 +3376,10 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,

 		oa2 = find_loaded_attr(log, attr, rno_base);

 		if (oa2) {

-			void *p2 = ntfs_memdup(attr, le32_to_cpu(attr->size));

-

+			void *p2 = kmemdup(attr, le32_to_cpu(attr->size),

+					   GFP_NOFS);

 			if (p2) {

-				ntfs_free(oa2->attr);

+				kfree(oa2->attr);

 				oa2->attr = p2;

 			}

 		}

@@ -3714,7 +3714,7 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe,

 	else if (mi != mi2_child)

 		mi_put(mi);

-	ntfs_free(buffer_le);

+	kfree(buffer_le);

 	return err;

@@ -3783,13 +3783,13 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 	if (!page_size)

 		return -EINVAL;

-	log = ntfs_zalloc(sizeof(struct ntfs_log));

+	log = kzalloc(sizeof(struct ntfs_log), GFP_NOFS);

 	if (!log)

 		return -ENOMEM;

 	log->ni = ni;

 	log->l_size = l_size;

-	log->one_page_buf = ntfs_malloc(page_size);

+	log->one_page_buf = kmalloc(page_size, GFP_NOFS);

 	if (!log->one_page_buf) {

 		err = -ENOMEM;

@@ -3854,17 +3854,17 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 		    sp->rhdr.sign == NTFS_CHKD_SIGNATURE) {

 			use_second_page = false;

 		}

-		ntfs_free(sp);

+		kfree(sp);

 	}

 	if (use_second_page) {

-		ntfs_free(rst_info.r_page);

+		kfree(rst_info.r_page);

 		memcpy(&rst_info, &rst_info2, sizeof(struct restart_info));

 		rst_info2.r_page = NULL;

 	}

 use_first_page:

-	ntfs_free(rst_info2.r_page);

+	kfree(rst_info2.r_page);

 check_restart_area:

 	/* If the restart area is at offset 0, we want to write the second restart area first */

@@ -4012,7 +4012,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 	log->current_avail = current_log_avail(log);

-	ra = ntfs_zalloc(log->restart_size);

+	ra = kzalloc(log->restart_size, GFP_NOFS);

 	if (!ra) {

 		err = -ENOMEM;

 		goto out;

@@ -4147,7 +4147,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 		goto out;

 	}

-	trtbl = ntfs_memdup(rt, t32);

+	trtbl = kmemdup(rt, t32, GFP_NOFS);

 	if (!trtbl) {

 		err = -ENOMEM;

 		goto out;

@@ -4187,7 +4187,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 		goto out;

 	}

-	dptbl = ntfs_memdup(rt, t32);

+	dptbl = kmemdup(rt, t32, GFP_NOFS);

 	if (!dptbl) {

 		err = -ENOMEM;

 		goto out;

@@ -4254,7 +4254,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 	t32 = lrh_length(lrh);

 	rec_len -= t32;

-	attr_names = ntfs_memdup(Add2Ptr(lrh, t32), rec_len);

+	attr_names = kmemdup(Add2Ptr(lrh, t32), rec_len, GFP_NOFS);

 	lcb_put(lcb);

 	lcb = NULL;

@@ -4289,7 +4289,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 		goto out;

 	}

-	oatbl = ntfs_memdup(rt, t32);

+	oatbl = kmemdup(rt, t32, GFP_NOFS);

 	if (!oatbl) {

 		err = -ENOMEM;

 		goto out;

@@ -4472,7 +4472,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 			      sizeof(u64);

 		} else {

 			t32 = log->clst_per_page;

-			ntfs_free(dptbl);

+			kfree(dptbl);

 			dptbl = init_rsttbl(struct_size(dp, page_lcns, t32),

 					    32);

 			if (!dptbl) {

@@ -4575,7 +4575,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 		t16 = le16_to_cpu(lrh->undo_len);

 		if (t16) {

-			oe->ptr = ntfs_malloc(t16);

+			oe->ptr = kmalloc(t16, GFP_NOFS);

 			if (!oe->ptr) {

 				err = -ENOMEM;

 				goto out;

@@ -4680,7 +4680,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 		goto next_dirty_page;

 	}

-	oa = ntfs_zalloc(sizeof(struct OpenAttr));

+	oa = kzalloc(sizeof(struct OpenAttr), GFP_NOFS);

 	if (!oa) {

 		err = -ENOMEM;

 		goto out;

@@ -4701,7 +4701,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 		attr = attr_create_nonres_log(sbi, oe->type, 0, oe->ptr,

 					      oe->name_len, 0);

 		if (!attr) {

-			ntfs_free(oa);

+			kfree(oa);

 			err = -ENOMEM;

 			goto out;

 		}

@@ -4720,7 +4720,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 		goto fake_attr;

 	t32 = le32_to_cpu(attr->size);

-	oa->attr = ntfs_memdup(attr, t32);

+	oa->attr = kmemdup(attr, t32, GFP_NOFS);

 	if (!oa->attr)

 		goto fake_attr;

@@ -4746,7 +4746,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 				 le64_to_cpu(attr->nres.evcn), svcn,

 				 Add2Ptr(attr, roff), t32 - roff);

 		if (err < 0) {

-			ntfs_free(oa->attr);

+			kfree(oa->attr);

 			oa->attr = NULL;

 			goto fake_attr;

 		}

@@ -4757,7 +4757,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)

 final_oe:

 	if (oe->is_attr_name == 1)

-		ntfs_free(oe->ptr);

+		kfree(oe->ptr);

 	oe->is_attr_name = 0;

 	oe->ptr = oa;