fs/ntfs3: Restyle comments to better align with kernel-doc (d3624466) · Commits · EulixOS / Software / Kernel

fs/ntfs3/attrib.c

+11 −7

Original line number	Diff line number	Diff line
		@@ -199,6 +199,7 @@ int attr_allocate_clusters(struct ntfs_sb_info sbi, struct runs_tree run,

		/* Add new fragment into run storage. */
		if (!run_add_entry(run, vcn, lcn, flen, opt == ALLOCATE_MFT)) {
		/* Undo last 'ntfs_look_for_free_space' */
		down_write_nested(&wnd->rw_lock, BITMAP_MUTEX_CLUSTERS);
		wnd_set_free(wnd, lcn, flen);
		up_write(&wnd->rw_lock);
		@@ -351,7 +352,6 @@ int attr_make_nonresident(struct ntfs_inode ni, struct ATTRIB attr,
		run_close(run);
		out1:
		kfree(attr_s);
		/* Reinsert le. */
		out:
		return err;
		}
		@@ -1153,14 +1153,18 @@ int attr_load_runs_vcn(struct ntfs_inode *ni, enum ATTR_TYPE type,
		u16 ro;

		attr = ni_find_attr(ni, NULL, NULL, type, name, name_len, &vcn, NULL);
		if (!attr)
		if (!attr) {
		/* Is record corrupted? */
		return -ENOENT;
		}

		svcn = le64_to_cpu(attr->nres.svcn);
		evcn = le64_to_cpu(attr->nres.evcn);

		if (evcn < vcn \|\| vcn < svcn)
		if (evcn < vcn \|\| vcn < svcn) {
		/* Is record corrupted? */
		return -EINVAL;
		}

		ro = le16_to_cpu(attr->nres.run_off);
		err = run_unpack_ex(run, ni->mi.sbi, ni->mi.rno, svcn, evcn, svcn,
		@@ -1171,7 +1175,7 @@ int attr_load_runs_vcn(struct ntfs_inode *ni, enum ATTR_TYPE type,
		}

		/*
		* attr_wof_load_runs_range - Load runs for given range [from to).
		* attr_load_runs_range - Load runs for given range [from to).
		*/
		int attr_load_runs_range(struct ntfs_inode *ni, enum ATTR_TYPE type,
		const __le16 name, u8 name_len, struct runs_tree run,
		@@ -1974,7 +1978,7 @@ int attr_punch_hole(struct ntfs_inode ni, u64 vbo, u64 bytes, u32 frame_size)
		total_size = le64_to_cpu(attr_b->nres.total_size);

		if (vbo >= alloc_size) {
		// NOTE: It is allowed.
		/* NOTE: It is allowed. */
		return 0;
		}

		@@ -1986,9 +1990,9 @@ int attr_punch_hole(struct ntfs_inode ni, u64 vbo, u64 bytes, u32 frame_size)
		bytes -= vbo;

		if ((vbo & mask) \|\| (bytes & mask)) {
		/* We have to zero a range(s)*/
		/* We have to zero a range(s). */
		if (frame_size == NULL) {
		/* Caller insists range is aligned */
		/* Caller insists range is aligned. */
		return -EINVAL;
		}
		*frame_size = mask + 1;

fs/ntfs3/bitmap.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ struct rb_node_key {
		size_t key;
		};

		/* Tree is sorted by start (key). */
		struct e_node {
		struct rb_node_key start; /* Tree sorted by start. */
		struct rb_node_key count; /* Tree sorted by len. */
		@@ -1117,7 +1116,7 @@ size_t wnd_find(struct wnd_bitmap *wnd, size_t to_alloc, size_t hint,
		sb = wnd->sb;
		log2_bits = sb->s_blocksize_bits + 3;

		/* At most two ranges [hint, max_alloc) + [0, hint) */
		/* At most two ranges [hint, max_alloc) + [0, hint). */
		Again:

		/* TODO: Optimize request for case nbits > wbits. */
		@@ -1241,7 +1240,7 @@ size_t wnd_find(struct wnd_bitmap *wnd, size_t to_alloc, size_t hint,
		continue;
		}

		/* Read window */
		/* Read window. */
		bh = wnd_map(wnd, iw);
		if (IS_ERR(bh)) {
		// TODO: Error.

fs/ntfs3/file.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -190,7 +190,8 @@ static int ntfs_extend_initialized_size(struct file *file,

		/*
		* ntfs_zero_range - Helper function for punch_hole.
		* It zeroes a range [vbo, vbo_to)
		*
		* It zeroes a range [vbo, vbo_to).
		*/
		static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)
		{
		@@ -231,12 +232,12 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)

		if (!buffer_mapped(bh)) {
		ntfs_get_block(inode, iblock, bh, 0);
		/* unmapped? It's a hole - nothing to do */
		/* Unmapped? It's a hole - nothing to do. */
		if (!buffer_mapped(bh))
		continue;
		}

		/* Ok, it's mapped. Make sure it's up-to-date */
		/* Ok, it's mapped. Make sure it's up-to-date. */
		if (PageUptodate(page))
		set_buffer_uptodate(bh);

		@@ -272,9 +273,8 @@ static int ntfs_zero_range(struct inode *inode, u64 vbo, u64 vbo_to)
		}

		/*
		* ntfs_sparse_cluster
		* ntfs_sparse_cluster - Helper function to zero a new allocated clusters.
		*
		* Helper function to zero a new allocated clusters
		* NOTE: 512 <= cluster size <= 2M
		*/
		void ntfs_sparse_cluster(struct inode inode, struct page page0, CLST vcn,
		@@ -588,7 +588,7 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)
		truncate_pagecache(inode, vbo_down);

		if (!is_sparsed(ni) && !is_compressed(ni)) {
		/* normal file */
		/* Normal file. */
		err = ntfs_zero_range(inode, vbo, end);
		goto out;
		}
		@@ -599,7 +599,7 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)
		if (err != E_NTFS_NOTALIGNED)
		goto out;

		/* process not aligned punch */
		/* Process not aligned punch. */
		mask = frame_size - 1;
		vbo_a = (vbo + mask) & ~mask;
		end_a = end & ~mask;
		@@ -647,7 +647,7 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)
		if (err)
		goto out;

		/* Wait for existing dio to complete */
		/* Wait for existing dio to complete. */
		inode_dio_wait(inode);

		truncate_pagecache(inode, vbo_down);
		@@ -1127,7 +1127,7 @@ static ssize_t ntfs_file_write_iter(struct kiocb iocb, struct iov_iter from)
		goto out;

		if (WARN_ON(ni->ni_flags & NI_FLAG_COMPRESSED_MASK)) {
		/* Should never be here, see ntfs_file_open() */
		/* Should never be here, see ntfs_file_open(). */
		ret = -EOPNOTSUPP;
		goto out;
		}

fs/ntfs3/frecord.c

+13 −14

Original line number	Diff line number	Diff line
		@@ -70,9 +70,8 @@ void ni_remove_mi(struct ntfs_inode ni, struct mft_inode mi)
		rb_erase(&mi->node, &ni->mi_tree);
		}

		/* ni_std
		*
		* Return: Pointer into std_info from primary record.
		/*
		* ni_std - Return: Pointer into std_info from primary record.
		*/
		struct ATTR_STD_INFO ni_std(struct ntfs_inode ni)
		{
		@@ -939,7 +938,7 @@ static int ni_ins_attr_ext(struct ntfs_inode ni, struct ATTR_LIST_ENTRY le,
		if (is_mft_data &&
		(mi_enum_attr(mi, NULL) \|\|
		vbo <= ((u64)mi->rno << sbi->record_bits))) {
		/* We can't accept this record 'case MFT's bootstrapping. */
		/* We can't accept this record 'cause MFT's bootstrapping. */
		continue;
		}
		if (is_mft &&
		@@ -1095,7 +1094,7 @@ static int ni_insert_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,
		goto out;
		}

		/* Start real attribute moving */
		/* Start real attribute moving. */
		attr = NULL;

		for (;;) {
		@@ -1542,7 +1541,7 @@ int ni_delete_all(struct ntfs_inode *ni)
		node = next;
		}

		/* Free base record */
		/* Free base record. */
		clear_rec_inuse(ni->mi.mrec);
		ni->mi.dirty = true;
		err = mi_write(&ni->mi, 0);
		@@ -2243,7 +2242,7 @@ int ni_decompress_file(struct ntfs_inode *ni)
		}

		if (attr->non_res && is_attr_sparsed(attr)) {
		/* Sarsed attribute header is 8 bytes bigger than normal. */
		/* Sparsed attribute header is 8 bytes bigger than normal. */
		struct MFT_REC *rec = mi->mrec;
		u32 used = le32_to_cpu(rec->used);
		u32 asize = le32_to_cpu(attr->size);
		@@ -2324,7 +2323,7 @@ static int decompress_lzx_xpress(struct ntfs_sb_info sbi, const char cmpr,
		mutex_lock(&sbi->compress.mtx_xpress);
		ctx = sbi->compress.xpress;
		if (!ctx) {
		/* Lazy initialize Xpress decompress context */
		/* Lazy initialize Xpress decompress context. */
		ctx = xpress_allocate_decompressor();
		if (!ctx) {
		err = -ENOMEM;
		@@ -2348,7 +2347,7 @@ static int decompress_lzx_xpress(struct ntfs_sb_info sbi, const char cmpr,
		/*
		* ni_read_frame
		*
		* Pages - array of locked pages.
		* Pages - Array of locked pages.
		*/
		int ni_read_frame(struct ntfs_inode ni, u64 frame_vbo, struct page *pages,
		u32 pages_per_frame)
		@@ -2740,7 +2739,7 @@ int ni_write_frame(struct ntfs_inode ni, struct page *pages,
		lznt = NULL;
		}

		/* Compress: frame_mem -> frame_ondisk. */
		/* Compress: frame_mem -> frame_ondisk */
		compr_size = compress_lznt(frame_mem, frame_size, frame_ondisk,
		frame_size, sbi->compress.lznt);
		mutex_unlock(&sbi->compress.mtx_lznt);

fs/ntfs3/fslog.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -1362,7 +1362,8 @@ static void log_create(struct ntfs_log *log, u32 l_size, const u64 last_lsn,
		/* Compute the log page values. */
		log->data_off = ALIGN(
		offsetof(struct RECORD_PAGE_HDR, fixups) +
		sizeof(short) * ((log->page_size >> SECTOR_SHIFT) + 1), 8);
		sizeof(short) * ((log->page_size >> SECTOR_SHIFT) + 1),
		8);
		log->data_size = log->page_size - log->data_off;
		log->record_header_len = sizeof(struct LFS_RECORD_HDR);

		@@ -1372,7 +1373,9 @@ static void log_create(struct ntfs_log *log, u32 l_size, const u64 last_lsn,
		/* Compute the restart page values. */
		log->ra_off = ALIGN(
		offsetof(struct RESTART_HDR, fixups) +
		sizeof(short) * ((log->sys_page_size >> SECTOR_SHIFT) + 1), 8);
		sizeof(short) *
		((log->sys_page_size >> SECTOR_SHIFT) + 1),
		8);
		log->restart_size = log->sys_page_size - log->ra_off;
		log->ra_size = struct_size(log->ra, clients, 1);
		log->current_openlog_count = open_log_count;
		@@ -5132,8 +5135,8 @@ int log_replay(struct ntfs_inode ni, bool initialized)
		rh->sys_page_size = cpu_to_le32(log->page_size);
		rh->page_size = cpu_to_le32(log->page_size);

		t16 = ALIGN(offsetof(struct RESTART_HDR, fixups) +
		sizeof(short) * t16, 8);
		t16 = ALIGN(offsetof(struct RESTART_HDR, fixups) + sizeof(short) * t16,
		8);
		rh->ra_off = cpu_to_le16(t16);
		rh->minor_ver = cpu_to_le16(1); // 0x1A:
		rh->major_ver = cpu_to_le16(1); // 0x1C: