mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fs/ntfs3: Fix wrong indentations 

Also simplifying code.

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
Konstantin Komarov 2022-10-07 18:55:03 +03:00
parent c380b52f6c
commit 07f4aa9dd2
No known key found for this signature in database
GPG Key ID: A9B0331F832407B6
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ntfs3/fslog.c
View File

@ -4824,8 +4824,7 @@ next_dirty_page_vcn:
goto out; goto out;
} }
attr = oa->attr; attr = oa->attr;
t64 = le64_to_cpu(attr->nres.alloc_size); if (size > le64_to_cpu(attr->nres.alloc_size)) {
if (size > t64) {
attr->nres.valid_size = attr->nres.data_size = attr->nres.valid_size = attr->nres.data_size =
attr->nres.alloc_size = cpu_to_le64(size); attr->nres.alloc_size = cpu_to_le64(size);
} }

8
fs/ntfs3/index.c
View File

@ -625,9 +625,8 @@ void fnd_clear(struct ntfs_fnd *fnd)
static int fnd_push(struct ntfs_fnd *fnd, struct indx_node *n, static int fnd_push(struct ntfs_fnd *fnd, struct indx_node *n,
struct NTFS_DE *e) struct NTFS_DE *e)
{ {
int i; int i = fnd->level;
i = fnd->level;
if (i < 0 || i >= ARRAY_SIZE(fnd->nodes)) if (i < 0 || i >= ARRAY_SIZE(fnd->nodes))
return -EINVAL; return -EINVAL;
fnd->nodes[i] = n; fnd->nodes[i] = n;
@ -2121,9 +2120,10 @@ static int indx_get_entry_to_replace(struct ntfs_index *indx,
fnd->de[level] = e; fnd->de[level] = e;
indx_write(indx, ni, n, 0); 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; return 0;
}
out: out:
fnd_clear(fnd); fnd_clear(fnd);

8
fs/ntfs3/inode.c
View File

@ -1818,11 +1818,12 @@ static int ntfs_translate_junction(const struct super_block *sb,
/* Make translated path a relative path to mount point */ /* Make translated path a relative path to mount point */
strcpy(translated, "./"); strcpy(translated, "./");
++link_path; /* Skip leading / */ ++link_path; /* Skip leading / */
for (tl_len = sizeof("./") - 1; *link_path; ++link_path) { for (tl_len = sizeof("./") - 1; *link_path; ++link_path) {
if (*link_path == '/') { if (*link_path == '/') {
if (PATH_MAX - tl_len < sizeof("../")) { 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); link_path);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
@ -1838,7 +1839,8 @@ static int ntfs_translate_junction(const struct super_block *sb,
++target_start; ++target_start;
if (!*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; err = -EINVAL;
goto out; goto out;
} }