Unverified Commit 96de65a9 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Code formatting and refactoring 



Added minor refactoring.
Added and fixed some comments.
In some places, the code has been reformatted to fit into 80 columns.
clang-format-12 was used to format code according kernel's .clang-format.

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

fs/ntfs3/attrib.c

+8 −9
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ int attr_set_size(struct ntfs_inode *ni, enum ATTR_TYPE type, 
	int err = 0;

	struct ntfs_sb_info *sbi = ni->mi.sbi;

	u8 cluster_bits = sbi->cluster_bits;

	bool is_mft =

		ni->mi.rno == MFT_REC_MFT && type == ATTR_DATA && !name_len;

	bool is_mft = ni->mi.rno == MFT_REC_MFT && type == ATTR_DATA &&

		      !name_len;

	u64 old_valid, old_size, old_alloc, new_alloc, new_alloc_tmp;

	struct ATTRIB *attr = NULL, *attr_b;

	struct ATTR_LIST_ENTRY *le, *le_b;
@@ -531,10 +531,9 @@ int attr_set_size(struct ntfs_inode *ni, enum ATTR_TYPE type, 
			pre_alloc = 0;

			if (type == ATTR_DATA && !name_len &&

			    sbi->options->prealloc) {

				pre_alloc =

					bytes_to_cluster(

						sbi,

						get_pre_allocated(new_size)) -

				pre_alloc = bytes_to_cluster(

						    sbi, get_pre_allocated(

								 new_size)) -

					    new_alen;

			}
@@ -573,8 +572,8 @@ int attr_set_size(struct ntfs_inode *ni, enum ATTR_TYPE type, 
			err = attr_allocate_clusters(

				sbi, run, vcn, lcn, to_allocate, &pre_alloc,

				is_mft ? ALLOCATE_MFT : ALLOCATE_DEF, &alen,

				is_mft ? 0

				       : (sbi->record_size -

				is_mft ? 0 :

					       (sbi->record_size -

					  le32_to_cpu(rec->used) + 8) /

							 3 +

						 1,

fs/ntfs3/bitmap.c

+11 −11
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ static struct kmem_cache *ntfs_enode_cachep; 


int __init ntfs3_init_bitmap(void)

{

	ntfs_enode_cachep =

		kmem_cache_create("ntfs3_enode_cache", sizeof(struct e_node), 0,

	ntfs_enode_cachep = kmem_cache_create("ntfs3_enode_cache",

					      sizeof(struct e_node), 0,

					      SLAB_RECLAIM_ACCOUNT, NULL);

	return ntfs_enode_cachep ? 0 : -ENOMEM;

}
@@ -286,9 +286,9 @@ static void wnd_add_free_ext(struct wnd_bitmap *wnd, size_t bit, size_t len, 
		if (wnd->uptodated != 1) {

			/* Check bits before 'bit'. */

			ib = wnd->zone_bit == wnd->zone_end ||

					     bit < wnd->zone_end

				     ? 0

				     : wnd->zone_end;

					     bit < wnd->zone_end ?

					   0 :

					   wnd->zone_end;



			while (bit > ib && wnd_is_free_hlp(wnd, bit - 1, 1)) {

				bit -= 1;
@@ -297,9 +297,9 @@ static void wnd_add_free_ext(struct wnd_bitmap *wnd, size_t bit, size_t len, 


			/* Check bits after 'end_in'. */

			ib = wnd->zone_bit == wnd->zone_end ||

					     end_in > wnd->zone_bit

				     ? wnd->nbits

				     : wnd->zone_bit;

					     end_in > wnd->zone_bit ?

					   wnd->nbits :

					   wnd->zone_bit;



			while (end_in < ib && wnd_is_free_hlp(wnd, end_in, 1)) {

				end_in += 1;
@@ -417,8 +417,8 @@ static void wnd_remove_free_ext(struct wnd_bitmap *wnd, size_t bit, size_t len) 
			return;

		n3 = rb_first(&wnd->count_tree);

		wnd->extent_max =

			n3 ? rb_entry(n3, struct e_node, count.node)->count.key

			   : 0;

			n3 ? rb_entry(n3, struct e_node, count.node)->count.key :

				   0;

		return;

	}

fs/ntfs3/file.c

+14 −11
Original line number Diff line number Diff line
@@ -22,20 +22,21 @@ static int ntfs_ioctl_fitrim(struct ntfs_sb_info *sbi, unsigned long arg) 
{

	struct fstrim_range __user *user_range;

	struct fstrim_range range;

	struct block_device *dev;

	int err;



	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;



	if (!bdev_max_discard_sectors(sbi->sb->s_bdev))

	dev = sbi->sb->s_bdev;

	if (!bdev_max_discard_sectors(dev))

		return -EOPNOTSUPP;



	user_range = (struct fstrim_range __user *)arg;

	if (copy_from_user(&range, user_range, sizeof(range)))

		return -EFAULT;



	range.minlen = max_t(u32, range.minlen,

			     bdev_discard_granularity(sbi->sb->s_bdev));

	range.minlen = max_t(u32, range.minlen, bdev_discard_granularity(dev));



	err = ntfs_trim_fs(sbi, &range);

	if (err < 0)
@@ -190,8 +191,8 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to) 


	for (; idx < idx_end; idx += 1, from = 0) {

		page_off = (loff_t)idx << PAGE_SHIFT;

		to = (page_off + PAGE_SIZE) > vbo_to ? (vbo_to - page_off)

						     : PAGE_SIZE;

		to = (page_off + PAGE_SIZE) > vbo_to ? (vbo_to - page_off) :

							     PAGE_SIZE;

		iblock = page_off >> inode->i_blkbits;



		page = find_or_create_page(mapping, idx,
@@ -564,13 +565,14 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len) 
		ni_unlock(ni);

	} else {

		/* Check new size. */

		u8 cluster_bits = sbi->cluster_bits;



		/* generic/213: expected -ENOSPC instead of -EFBIG. */

		if (!is_supported_holes) {

			loff_t to_alloc = new_size - inode_get_bytes(inode);



			if (to_alloc > 0 &&

			    (to_alloc >> sbi->cluster_bits) >

			    (to_alloc >> cluster_bits) >

				    wnd_zeroes(&sbi->used.bitmap)) {

				err = -ENOSPC;

				goto out;
@@ -591,7 +593,7 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len) 
		}



		if (is_supported_holes) {

			CLST vcn = vbo >> sbi->cluster_bits;

			CLST vcn = vbo >> cluster_bits;

			CLST cend = bytes_to_cluster(sbi, end);

			CLST cend_v = bytes_to_cluster(sbi, ni->i_valid);

			CLST lcn, clen;
@@ -1049,8 +1051,8 @@ static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	if (ret)

		goto out;



	ret = is_compressed(ni) ? ntfs_compress_write(iocb, from)

				: __generic_file_write_iter(iocb, from);

	ret = is_compressed(ni) ? ntfs_compress_write(iocb, from) :

					__generic_file_write_iter(iocb, from);



out:

	inode_unlock(inode);
@@ -1102,7 +1104,8 @@ static int ntfs_file_release(struct inode *inode, struct file *file) 
	int err = 0;



	/* If we are last writer on the inode, drop the block reservation. */

	if (sbi->options->prealloc && ((file->f_mode & FMODE_WRITE) &&

	if (sbi->options->prealloc &&

	    ((file->f_mode & FMODE_WRITE) &&

	     atomic_read(&inode->i_writecount) == 1)) {

		ni_lock(ni);

		down_write(&ni->file.run_lock);

fs/ntfs3/frecord.c

+17 −20
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ struct ATTR_STD_INFO *ni_std(struct ntfs_inode *ni) 
	const struct ATTRIB *attr;



	attr = mi_find_attr(&ni->mi, NULL, ATTR_STD, NULL, 0, NULL);

	return attr ? resident_data_ex(attr, sizeof(struct ATTR_STD_INFO))

		    : NULL;

	return attr ? resident_data_ex(attr, sizeof(struct ATTR_STD_INFO)) :

			    NULL;

}



/*
@@ -91,8 +91,8 @@ struct ATTR_STD_INFO5 *ni_std5(struct ntfs_inode *ni) 


	attr = mi_find_attr(&ni->mi, NULL, ATTR_STD, NULL, 0, NULL);



	return attr ? resident_data_ex(attr, sizeof(struct ATTR_STD_INFO5))

		    : NULL;

	return attr ? resident_data_ex(attr, sizeof(struct ATTR_STD_INFO5)) :

			    NULL;

}



/*
@@ -1439,8 +1439,8 @@ int ni_insert_nonresident(struct ntfs_inode *ni, enum ATTR_TYPE type, 
	int err;

	CLST plen;

	struct ATTRIB *attr;

	bool is_ext =

		(flags & (ATTR_FLAG_SPARSED | ATTR_FLAG_COMPRESSED)) && !svcn;

	bool is_ext = (flags & (ATTR_FLAG_SPARSED | ATTR_FLAG_COMPRESSED)) &&

		      !svcn;

	u32 name_size = ALIGN(name_len * sizeof(short), 8);

	u32 name_off = is_ext ? SIZEOF_NONRESIDENT_EX : SIZEOF_NONRESIDENT;

	u32 run_off = name_off + name_size;
@@ -1756,9 +1756,9 @@ int ni_new_attr_flags(struct ntfs_inode *ni, enum FILE_ATTRIBUTE new_fa) 
	}



	/* Resize nonresident empty attribute in-place only. */

	new_asize = (new_aflags & (ATTR_FLAG_COMPRESSED | ATTR_FLAG_SPARSED))

			    ? (SIZEOF_NONRESIDENT_EX + 8)

			    : (SIZEOF_NONRESIDENT + 8);

	new_asize = (new_aflags & (ATTR_FLAG_COMPRESSED | ATTR_FLAG_SPARSED)) ?

				  (SIZEOF_NONRESIDENT_EX + 8) :

				  (SIZEOF_NONRESIDENT + 8);



	if (!mi_resize_attr(mi, attr, new_asize - le32_to_cpu(attr->size)))

		return -EOPNOTSUPP;
@@ -2965,14 +2965,14 @@ bool ni_remove_name_undo(struct ntfs_inode *dir_ni, struct ntfs_inode *ni, 
{

	struct ntfs_sb_info *sbi = ni->mi.sbi;

	struct ATTRIB *attr;

	u16 de_key_size = de2 ? le16_to_cpu(de2->key_size) : 0;

	u16 de_key_size;



	switch (undo_step) {

	case 4:

		de_key_size = le16_to_cpu(de2->key_size);

		if (ni_insert_resident(ni, de_key_size, ATTR_NAME, NULL, 0,

				       &attr, NULL, NULL)) {

				       &attr, NULL, NULL))

			return false;

		}

		memcpy(Add2Ptr(attr, SIZEOF_RESIDENT), de2 + 1, de_key_size);



		mi_get_ref(&ni->mi, &de2->ref);
@@ -2981,19 +2981,16 @@ bool ni_remove_name_undo(struct ntfs_inode *dir_ni, struct ntfs_inode *ni, 
		de2->flags = 0;

		de2->res = 0;



		if (indx_insert_entry(&dir_ni->dir, dir_ni, de2, sbi, NULL,

				      1)) {

		if (indx_insert_entry(&dir_ni->dir, dir_ni, de2, sbi, NULL, 1))

			return false;

		}

		fallthrough;



	case 2:

		de_key_size = le16_to_cpu(de->key_size);



		if (ni_insert_resident(ni, de_key_size, ATTR_NAME, NULL, 0,

				       &attr, NULL, NULL)) {

				       &attr, NULL, NULL))

			return false;

		}



		memcpy(Add2Ptr(attr, SIZEOF_RESIDENT), de + 1, de_key_size);

		mi_get_ref(&ni->mi, &de->ref);
@@ -3162,9 +3159,9 @@ static bool ni_update_parent(struct ntfs_inode *ni, struct NTFS_DUP_INFO *dup, 
			u64 data_size = le64_to_cpu(attr->nres.data_size);

			__le64 valid_le;



			dup->alloc_size = is_attr_ext(attr)

						  ? attr->nres.total_size

						  : attr->nres.alloc_size;

			dup->alloc_size = is_attr_ext(attr) ?

							attr->nres.total_size :

							attr->nres.alloc_size;

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



			if (new_valid > data_size)

fs/ntfs3/fslog.c

+39 −38
Original line number Diff line number Diff line
@@ -827,9 +827,9 @@ static inline struct RESTART_TABLE *extend_rsttbl(struct RESTART_TABLE *tbl, 


	memcpy(rt + 1, tbl + 1, esize * used);



	rt->free_goal = free_goal == ~0u

				? cpu_to_le32(~0u)

				: cpu_to_le32(sizeof(struct RESTART_TABLE) +

	rt->free_goal = free_goal == ~0u ?

				      cpu_to_le32(~0u) :

				      cpu_to_le32(sizeof(struct RESTART_TABLE) +

					    free_goal * esize);



	if (tbl->first_free) {
@@ -1089,9 +1089,9 @@ static inline u64 base_lsn(struct ntfs_log *log, 
		    (lsn < (lsn_to_vbo(log, h_lsn) & ~log->page_mask) ? 1 : 0))

		   << log->file_data_bits) +

		  ((((is_log_record_end(hdr) &&

		      h_lsn <= le64_to_cpu(hdr->record_hdr.last_end_lsn))

			     ? le16_to_cpu(hdr->record_hdr.next_record_off)

			     : log->page_size) +

		      h_lsn <= le64_to_cpu(hdr->record_hdr.last_end_lsn)) ?

				   le16_to_cpu(hdr->record_hdr.next_record_off) :

				   log->page_size) +

		    lsn) >>

		   3);
@@ -1298,9 +1298,9 @@ static void log_init_pg_hdr(struct ntfs_log *log, u32 sys_page_size, 
	if (!log->clst_per_page)

		log->clst_per_page = 1;



	log->first_page = major_ver >= 2

				  ? 0x22 * page_size

				  : ((sys_page_size << 1) + (page_size << 1));

	log->first_page = major_ver >= 2 ?

					0x22 * page_size :

					((sys_page_size << 1) + (page_size << 1));

	log->major_ver = major_ver;

	log->minor_ver = minor_ver;

}
@@ -1512,20 +1512,19 @@ static u32 current_log_avail(struct ntfs_log *log) 
	 * have to compute the free range.

	 * If there is no oldest lsn then start at the first page of the file.

	 */

	oldest_off = (log->l_flags & NTFSLOG_NO_OLDEST_LSN)

			     ? log->first_page

			     : (log->oldest_lsn_off & ~log->sys_page_mask);

	oldest_off = (log->l_flags & NTFSLOG_NO_OLDEST_LSN) ?

				   log->first_page :

				   (log->oldest_lsn_off & ~log->sys_page_mask);



	/*

	 * We will use the next log page offset to compute the next free page.

	 * If we are going to reuse this page go to the next page.

	 * If we are at the first page then use the end of the file.

	 */

	next_free_off = (log->l_flags & NTFSLOG_REUSE_TAIL)

				? log->next_page + log->page_size

				: log->next_page == log->first_page

					  ? log->l_size

					  : log->next_page;

	next_free_off = (log->l_flags & NTFSLOG_REUSE_TAIL) ?

				      log->next_page + log->page_size :

			log->next_page == log->first_page ? log->l_size :

								  log->next_page;



	/* If the two offsets are the same then there is no available space. */

	if (oldest_off == next_free_off)
@@ -1535,9 +1534,9 @@ static u32 current_log_avail(struct ntfs_log *log) 
	 * this range from the total available pages.

	 */

	free_bytes =

		oldest_off < next_free_off

			? log->total_avail_pages - (next_free_off - oldest_off)

			: oldest_off - next_free_off;

		oldest_off < next_free_off ?

			      log->total_avail_pages - (next_free_off - oldest_off) :

			      oldest_off - next_free_off;



	free_bytes >>= log->page_bits;

	return free_bytes * log->reserved;
@@ -1671,8 +1670,8 @@ static int last_log_lsn(struct ntfs_log *log) 
	}



	best_lsn1 = first_tail ? base_lsn(log, first_tail, first_file_off) : 0;

	best_lsn2 =

		second_tail ? base_lsn(log, second_tail, second_file_off) : 0;

	best_lsn2 = second_tail ? base_lsn(log, second_tail, second_file_off) :

					0;



	if (first_tail && second_tail) {

		if (best_lsn1 > best_lsn2) {
@@ -1767,8 +1766,8 @@ static int last_log_lsn(struct ntfs_log *log) 


	page_cnt = page_pos = 1;



	curpage_off = seq_base == log->seq_num ? min(log->next_page, page_off)

					       : log->next_page;

	curpage_off = seq_base == log->seq_num ? min(log->next_page, page_off) :

						       log->next_page;



	wrapped_file =

		curpage_off == log->first_page &&
@@ -1826,9 +1825,9 @@ static int last_log_lsn(struct ntfs_log *log) 
			    le64_to_cpu(cur_page->record_hdr.last_end_lsn) &&

		    ((lsn_cur >> log->file_data_bits) +

		     ((curpage_off <

		       (lsn_to_vbo(log, lsn_cur) & ~log->page_mask))

			      ? 1

			      : 0)) != expected_seq) {

		       (lsn_to_vbo(log, lsn_cur) & ~log->page_mask)) ?

				    1 :

				    0)) != expected_seq) {

			goto check_tail;

		}
@@ -2642,9 +2641,10 @@ static inline bool check_index_root(const struct ATTRIB *attr, 
{

	bool ret;

	const struct INDEX_ROOT *root = resident_data(attr);

	u8 index_bits = le32_to_cpu(root->index_block_size) >= sbi->cluster_size

				? sbi->cluster_bits

				: SECTOR_SHIFT;

	u8 index_bits = le32_to_cpu(root->index_block_size) >=

					sbi->cluster_size ?

				      sbi->cluster_bits :

				      SECTOR_SHIFT;

	u8 block_clst = root->index_block_clst;



	if (le32_to_cpu(attr->res.data_size) < sizeof(struct INDEX_ROOT) ||
@@ -3683,7 +3683,8 @@ static int do_action(struct ntfs_log *log, struct OPEN_ATTR_ENRTY *oe, 


	if (a_dirty) {

		attr = oa->attr;

		err = ntfs_sb_write_run(sbi, oa->run1, vbo, buffer_le, bytes, 0);

		err = ntfs_sb_write_run(sbi, oa->run1, vbo, buffer_le, bytes,

					0);

		if (err)

			goto out;

	}
@@ -3768,11 +3769,10 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) 
	if (!log)

		return -ENOMEM;



	memset(&rst_info, 0, sizeof(struct restart_info));



	log->ni = ni;

	log->l_size = l_size;

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



	if (!log->one_page_buf) {

		err = -ENOMEM;

		goto out;
@@ -3783,6 +3783,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) 
	log->page_bits = blksize_bits(page_size);



	/* Look for a restart area on the disk. */

	memset(&rst_info, 0, sizeof(struct restart_info));

	err = log_read_rst(log, l_size, true, &rst_info);

	if (err)

		goto out;
@@ -3859,10 +3860,10 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) 
	log->init_ra = !!rst_info.vbo;



	/* If we have a valid page then grab a pointer to the restart area. */

	ra2 = rst_info.valid_page

		      ? Add2Ptr(rst_info.r_page,

				le16_to_cpu(rst_info.r_page->ra_off))

		      : NULL;

	ra2 = rst_info.valid_page ?

			    Add2Ptr(rst_info.r_page,

			      le16_to_cpu(rst_info.r_page->ra_off)) :

			    NULL;



	if (rst_info.chkdsk_was_run ||

	    (ra2 && ra2->client_idx[1] == LFS_NO_CLIENT_LE)) {