summaryrefslogtreecommitdiffstats
path: root/fs/ntfs3
diff options
context:
space:
mode:
authorKonstantin Komarov <almaz.alexandrovich@paragon-software.com>2022-10-07 17:55:03 +0200
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>2022-11-14 17:50:44 +0100
commit07f4aa9dd245661414a2db0574bed9bc5736ccfd (patch)
treefa6ab14bfd770ec8d96a4f2a2fc2201af819ab7a /fs/ntfs3
parentfs/ntfs3: Change new sparse cluster processing (diff)
downloadlinux-07f4aa9dd245661414a2db0574bed9bc5736ccfd.tar.xz
linux-07f4aa9dd245661414a2db0574bed9bc5736ccfd.zip
fs/ntfs3: Fix wrong indentations
Also simplifying code. Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Diffstat (limited to 'fs/ntfs3')
-rw-r--r--fs/ntfs3/fslog.c3
-rw-r--r--fs/ntfs3/index.c8
-rw-r--r--fs/ntfs3/inode.c8
3 files changed, 10 insertions, 9 deletions
diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c
index 5289c25b1ee4..e61545b9772e 100644
--- 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 bc9ab93db1d0..a2e1e07b5bb8 100644
--- 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 bf56e78de653..45a4ddc0bcdc 100644
--- 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;
}