Unverified Commit 1b998c4c authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Konstantin Komarov
Browse files

fs/ntfs3: Remove unused ni_load_attr 



ni_load_attr() was added in 2021 by
commit 4342306f ("fs/ntfs3: Add file operations and implementation")
but hasn't been used.

Remove it.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 6bb81b94

fs/ntfs3/frecord.c

+0 −57
Original line number Diff line number Diff line
@@ -280,63 +280,6 @@ struct ATTRIB *ni_enum_attr_ex(struct ntfs_inode *ni, struct ATTRIB *attr, 
	return rec_find_attr_le(ni, mi2, le2);

}



/*

 * ni_load_attr - Load attribute that contains given VCN.

 */

struct ATTRIB *ni_load_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,

			    const __le16 *name, u8 name_len, CLST vcn,

			    struct mft_inode **pmi)

{

	struct ATTR_LIST_ENTRY *le;

	struct ATTRIB *attr;

	struct mft_inode *mi;

	struct ATTR_LIST_ENTRY *next;



	if (!ni->attr_list.size) {

		if (pmi)

			*pmi = &ni->mi;

		return mi_find_attr(ni, &ni->mi, NULL, type, name, name_len,

				    NULL);

	}



	le = al_find_ex(ni, NULL, type, name, name_len, NULL);

	if (!le)

		return NULL;



	/*

	 * Unfortunately ATTR_LIST_ENTRY contains only start VCN.

	 * So to find the ATTRIB segment that contains 'vcn' we should

	 * enumerate some entries.

	 */

	if (vcn) {

		for (;; le = next) {

			next = al_find_ex(ni, le, type, name, name_len, NULL);

			if (!next || le64_to_cpu(next->vcn) > vcn)

				break;

		}

	}



	if (ni_load_mi(ni, le, &mi))

		return NULL;



	if (pmi)

		*pmi = mi;



	attr = mi_find_attr(ni, mi, NULL, type, name, name_len, &le->id);

	if (!attr)

		return NULL;



	if (!attr->non_res)

		return attr;



	if (le64_to_cpu(attr->nres.svcn) <= vcn &&

	    vcn <= le64_to_cpu(attr->nres.evcn))

		return attr;



	_ntfs_bad_inode(&ni->vfs_inode);

	return NULL;

}



/*

 * ni_load_all_mi - Load all subrecords.

 */

fs/ntfs3/ntfs_fs.h

+0 −3
Original line number Diff line number Diff line
@@ -530,9 +530,6 @@ struct ATTRIB *ni_find_attr(struct ntfs_inode *ni, struct ATTRIB *attr, 
struct ATTRIB *ni_enum_attr_ex(struct ntfs_inode *ni, struct ATTRIB *attr,

			       struct ATTR_LIST_ENTRY **le,

			       struct mft_inode **mi);

struct ATTRIB *ni_load_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,

			    const __le16 *name, u8 name_len, CLST vcn,

			    struct mft_inode **pmi);

int ni_load_all_mi(struct ntfs_inode *ni);

bool ni_add_subrecord(struct ntfs_inode *ni, CLST rno, struct mft_inode **mi);

int ni_remove_attr(struct ntfs_inode *ni, enum ATTR_TYPE type,