File tree Expand file tree Collapse file tree 3 files changed +10
-9
lines changed Expand file tree Collapse file tree 3 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -4824,8 +4824,7 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)
4824
4824
goto out ;
4825
4825
}
4826
4826
attr = oa -> attr ;
4827
- t64 = le64_to_cpu (attr -> nres .alloc_size );
4828
- if (size > t64 ) {
4827
+ if (size > le64_to_cpu (attr -> nres .alloc_size )) {
4829
4828
attr -> nres .valid_size = attr -> nres .data_size =
4830
4829
attr -> nres .alloc_size = cpu_to_le64 (size );
4831
4830
}
Original file line number Diff line number Diff line change @@ -625,9 +625,8 @@ void fnd_clear(struct ntfs_fnd *fnd)
625
625
static int fnd_push (struct ntfs_fnd * fnd , struct indx_node * n ,
626
626
struct NTFS_DE * e )
627
627
{
628
- int i ;
628
+ int i = fnd -> level ;
629
629
630
- i = fnd -> level ;
631
630
if (i < 0 || i >= ARRAY_SIZE (fnd -> nodes ))
632
631
return - EINVAL ;
633
632
fnd -> nodes [i ] = n ;
@@ -2121,9 +2120,10 @@ static int indx_get_entry_to_replace(struct ntfs_index *indx,
2121
2120
fnd -> de [level ] = e ;
2122
2121
indx_write (indx , ni , n , 0 );
2123
2122
2124
- /* Check to see if this action created an empty leaf. */
2125
- if ( ib_is_leaf ( ib ) && ib_is_empty ( ib ))
2123
+ if ( ib_is_leaf ( ib ) && ib_is_empty ( ib )) {
2124
+ /* An empty leaf. */
2126
2125
return 0 ;
2126
+ }
2127
2127
2128
2128
out :
2129
2129
fnd_clear (fnd );
Original file line number Diff line number Diff line change @@ -1818,11 +1818,12 @@ static int ntfs_translate_junction(const struct super_block *sb,
1818
1818
1819
1819
/* Make translated path a relative path to mount point */
1820
1820
strcpy (translated , "./" );
1821
- ++ link_path ; /* Skip leading / */
1821
+ ++ link_path ; /* Skip leading / */
1822
1822
for (tl_len = sizeof ("./" ) - 1 ; * link_path ; ++ link_path ) {
1823
1823
if (* link_path == '/' ) {
1824
1824
if (PATH_MAX - tl_len < sizeof ("../" )) {
1825
- ntfs_err (sb , "Link path %s has too many components" ,
1825
+ ntfs_err (sb ,
1826
+ "Link path %s has too many components" ,
1826
1827
link_path );
1827
1828
err = - EINVAL ;
1828
1829
goto out ;
@@ -1838,7 +1839,8 @@ static int ntfs_translate_junction(const struct super_block *sb,
1838
1839
++ target_start ;
1839
1840
1840
1841
if (!* target_start ) {
1841
- ntfs_err (sb , "Link target (%s) missing drive separator" , target );
1842
+ ntfs_err (sb , "Link target (%s) missing drive separator" ,
1843
+ target );
1842
1844
err = - EINVAL ;
1843
1845
goto out ;
1844
1846
}
You can’t perform that action at this time.
0 commit comments