Unverified Commit 07f4aa9d authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Fix wrong indentations 



Also simplifying code.

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

fs/ntfs3/fslog.c

+1 −2
Original line number Diff line number Diff line
@@ -4824,8 +4824,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) 
		goto out;

	}

	attr = oa->attr;

	t64 = le64_to_cpu(attr->nres.alloc_size);

	if (size > t64) {

	if (size > le64_to_cpu(attr->nres.alloc_size)) {

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

			attr->nres.alloc_size = cpu_to_le64(size);

	}

fs/ntfs3/index.c

+4 −4
Original line number Diff line number Diff line
@@ -625,9 +625,8 @@ void fnd_clear(struct ntfs_fnd *fnd) 
static int fnd_push(struct ntfs_fnd *fnd, struct indx_node *n,

		    struct NTFS_DE *e)

{

	int i;

	int i = fnd->level;



	i = fnd->level;

	if (i < 0 || i >= ARRAY_SIZE(fnd->nodes))

		return -EINVAL;

	fnd->nodes[i] = n;
@@ -2121,9 +2120,10 @@ static int indx_get_entry_to_replace(struct ntfs_index *indx, 
	fnd->de[level] = e;

	indx_write(indx, ni, n, 0);



	/* Check to see if this action created an empty leaf. */

	if (ib_is_leaf(ib) && ib_is_empty(ib))

	if (ib_is_leaf(ib) && ib_is_empty(ib)) {

		/* An empty leaf. */

		return 0;

	}



out:

	fnd_clear(fnd);

fs/ntfs3/inode.c

+5 −3
Original line number Diff line number Diff line
@@ -1822,7 +1822,8 @@ static int ntfs_translate_junction(const struct super_block *sb, 
	for (tl_len = sizeof("./") - 1; *link_path; ++link_path) {

		if (*link_path == '/') {

			if (PATH_MAX - tl_len < sizeof("../")) {

				ntfs_err(sb, "Link path %s has too many components",

				ntfs_err(sb,

					 "Link path %s has too many components",

					 link_path);

				err = -EINVAL;

				goto out;
@@ -1838,7 +1839,8 @@ static int ntfs_translate_junction(const struct super_block *sb, 
		++target_start;



	if (!*target_start) {

		ntfs_err(sb, "Link target (%s) missing drive separator", target);

		ntfs_err(sb, "Link target (%s) missing drive separator",

			 target);

		err = -EINVAL;

		goto out;

	}