@@ -995,15 +995,15 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
995
995
return err ;
996
996
}
997
997
998
- static int exfat_rename_file (struct inode * inode , struct exfat_chain * p_dir ,
998
+ static int exfat_rename_file (struct inode * parent_inode , struct exfat_chain * p_dir ,
999
999
int oldentry , struct exfat_uni_name * p_uniname ,
1000
1000
struct exfat_inode_info * ei )
1001
1001
{
1002
1002
int ret , num_new_entries ;
1003
1003
struct exfat_dentry * epold , * epnew ;
1004
- struct super_block * sb = inode -> i_sb ;
1004
+ struct super_block * sb = parent_inode -> i_sb ;
1005
1005
struct exfat_entry_set_cache old_es , new_es ;
1006
- int sync = IS_DIRSYNC (inode );
1006
+ int sync = IS_DIRSYNC (parent_inode );
1007
1007
1008
1008
if (unlikely (exfat_forced_shutdown (sb )))
1009
1009
return - EIO ;
@@ -1023,7 +1023,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
1023
1023
if (old_es .num_entries < num_new_entries ) {
1024
1024
int newentry ;
1025
1025
1026
- newentry = exfat_find_empty_entry (inode , p_dir , num_new_entries ,
1026
+ newentry = exfat_find_empty_entry (parent_inode , p_dir , num_new_entries ,
1027
1027
& new_es );
1028
1028
if (newentry < 0 ) {
1029
1029
ret = newentry ; /* -EIO or -ENOSPC */
@@ -1047,7 +1047,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
1047
1047
if (ret )
1048
1048
goto put_old_es ;
1049
1049
1050
- exfat_remove_entries (inode , & old_es , ES_IDX_FILE );
1050
+ exfat_remove_entries (parent_inode , & old_es , ES_IDX_FILE );
1051
1051
ei -> dir = * p_dir ;
1052
1052
ei -> entry = newentry ;
1053
1053
} else {
@@ -1056,7 +1056,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
1056
1056
ei -> attr |= EXFAT_ATTR_ARCHIVE ;
1057
1057
}
1058
1058
1059
- exfat_remove_entries (inode , & old_es , ES_IDX_FIRST_FILENAME + 1 );
1059
+ exfat_remove_entries (parent_inode , & old_es , ES_IDX_FIRST_FILENAME + 1 );
1060
1060
exfat_init_ext_entry (& old_es , num_new_entries , p_uniname );
1061
1061
}
1062
1062
return exfat_put_dentry_set (& old_es , sync );
@@ -1066,13 +1066,13 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
1066
1066
return ret ;
1067
1067
}
1068
1068
1069
- static int exfat_move_file (struct inode * inode , struct exfat_chain * p_olddir ,
1069
+ static int exfat_move_file (struct inode * parent_inode , struct exfat_chain * p_olddir ,
1070
1070
int oldentry , struct exfat_chain * p_newdir ,
1071
1071
struct exfat_uni_name * p_uniname , struct exfat_inode_info * ei )
1072
1072
{
1073
1073
int ret , newentry , num_new_entries ;
1074
1074
struct exfat_dentry * epmov , * epnew ;
1075
- struct super_block * sb = inode -> i_sb ;
1075
+ struct super_block * sb = parent_inode -> i_sb ;
1076
1076
struct exfat_entry_set_cache mov_es , new_es ;
1077
1077
1078
1078
num_new_entries = exfat_calc_num_entries (p_uniname );
@@ -1084,7 +1084,7 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
1084
1084
if (ret )
1085
1085
return - EIO ;
1086
1086
1087
- newentry = exfat_find_empty_entry (inode , p_newdir , num_new_entries ,
1087
+ newentry = exfat_find_empty_entry (parent_inode , p_newdir , num_new_entries ,
1088
1088
& new_es );
1089
1089
if (newentry < 0 ) {
1090
1090
ret = newentry ; /* -EIO or -ENOSPC */
@@ -1104,18 +1104,18 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
1104
1104
* epnew = * epmov ;
1105
1105
1106
1106
exfat_init_ext_entry (& new_es , num_new_entries , p_uniname );
1107
- exfat_remove_entries (inode , & mov_es , ES_IDX_FILE );
1107
+ exfat_remove_entries (parent_inode , & mov_es , ES_IDX_FILE );
1108
1108
1109
1109
exfat_chain_set (& ei -> dir , p_newdir -> dir , p_newdir -> size ,
1110
1110
p_newdir -> flags );
1111
1111
1112
1112
ei -> entry = newentry ;
1113
1113
1114
- ret = exfat_put_dentry_set (& new_es , IS_DIRSYNC (inode ));
1114
+ ret = exfat_put_dentry_set (& new_es , IS_DIRSYNC (parent_inode ));
1115
1115
if (ret )
1116
1116
goto put_mov_es ;
1117
1117
1118
- return exfat_put_dentry_set (& mov_es , IS_DIRSYNC (inode ));
1118
+ return exfat_put_dentry_set (& mov_es , IS_DIRSYNC (parent_inode ));
1119
1119
1120
1120
put_mov_es :
1121
1121
exfat_put_dentry_set (& mov_es , false);
0 commit comments