fs/ntfs3: Fix wrong indentations

Also simplifying code.

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

diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
index 5289c25b1ee43b6cac5ccf9c4570032706f049fd..e61545b9772e890a88d989484a85f5a19e5bd5cd 100644 (file)
--- a/fs/ntfs3/fslog.c
+++ b/fs/ntfs3/fslog.c
@@ -4824,8 +4824,7 @@ next_dirty_page_vcn:
                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);
        }

diff --git a/fs/ntfs3/index.c b/fs/ntfs3/index.c
index bc9ab93db1d0ee50e32b772bec83957d26d8ab15..a2e1e07b5bb8fb88b5ed8ca598c5ccecc7da2897 100644 (file)
--- a/fs/ntfs3/index.c
+++ b/fs/ntfs3/index.c
@@ -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);

diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index bf56e78de653f9e072bec33b8e97d3ae95fc5201..45a4ddc0bcdc854fa5f74a589966dbdebf616832 100644 (file)
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -1818,11 +1818,12 @@ static int ntfs_translate_junction(const struct super_block *sb,
 
        /* Make translated path a relative path to mount point */
        strcpy(translated, "./");
-       ++link_path;    /* Skip leading / */
+       ++link_path; /* Skip leading / */
        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;
        }