Skip to content

Commit 94e38bb

Browse files
RoyWFHuangRoyWFHuang
committed
Rename variables for better readability
1 parent 8cf581b commit 94e38bb

File tree

1 file changed

+58
-58
lines changed

1 file changed

+58
-58
lines changed

‎inode.c‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -753,31 +753,31 @@ static int simplefs_unlink(struct inode *dir, struct dentry *dentry)
753753

754754
#if SIMPLEFS_AT_LEAST(6, 3, 0)
755755
static int simplefs_rename(struct mnt_idmap *id,
756-
struct inode *old_dir,
757-
struct dentry *old_dentry,
758-
struct inode *new_dir,
759-
struct dentry *new_dentry,
756+
struct inode *src_dir,
757+
struct dentry *src_dentry,
758+
struct inode *dest_dir,
759+
struct dentry *dest_dentry,
760760
unsigned int flags)
761761
#elif SIMPLEFS_AT_LEAST(5, 12, 0)
762762
static int simplefs_rename(struct user_namespace *ns,
763-
struct inode *old_dir,
764-
struct dentry *old_dentry,
765-
struct inode *new_dir,
766-
struct dentry *new_dentry,
763+
struct inode *src_dir,
764+
struct dentry *src_dentry,
765+
struct inode *dest_dir,
766+
struct dentry *dest_dentry,
767767
unsigned int flags)
768768
#else
769-
static int simplefs_rename(struct inode *old_dir,
770-
struct dentry *old_dentry,
771-
struct inode *new_dir,
772-
struct dentry *new_dentry,
769+
static int simplefs_rename(struct inode *src_dir,
770+
struct dentry *src_dentry,
771+
struct inode *dest_dir,
772+
struct dentry *dest_dentry,
773773
unsigned int flags)
774774
#endif
775775
{
776-
struct super_block *sb = old_dir->i_sb;
777-
struct simplefs_inode_info *ci_new = SIMPLEFS_INODE(new_dir);
778-
struct inode *src = d_inode(old_dentry);
776+
struct super_block *sb = src_dir->i_sb;
777+
struct simplefs_inode_info *ci_dest = SIMPLEFS_INODE(dest_dir);
778+
struct inode *src = d_inode(src_dentry);
779779
struct buffer_head *bh_new = NULL, *bh2 = NULL;
780-
struct simplefs_file_ei_block *eblock_new = NULL;
780+
struct simplefs_file_ei_block *eblk_dest = NULL;
781781
struct simplefs_dir_block *dblock = NULL;
782782

783783
#if SIMPLEFS_AT_LEAST(6, 6, 0) && SIMPLEFS_LESS_EQUAL(6, 7, 0)
@@ -792,21 +792,21 @@ static int simplefs_rename(struct inode *old_dir,
792792
return -EINVAL;
793793

794794
/* Check if filename is not too long */
795-
if (strlen(new_dentry->d_name.name) > SIMPLEFS_FILENAME_LEN)
795+
if (strlen(dest_dentry->d_name.name) > SIMPLEFS_FILENAME_LEN)
796796
return -ENAMETOOLONG;
797797

798-
/* Fail if new_dentry exists or if new_dir is full */
799-
bh_new = sb_bread(sb, ci_new->ei_block);
798+
/* Fail if dest_dentry exists or if dest_dir is full */
799+
bh_new = sb_bread(sb, ci_dest->ei_block);
800800
if (!bh_new)
801801
return -EIO;
802802

803-
eblock_new = (struct simplefs_file_ei_block *) bh_new->b_data;
803+
eblk_dest = (struct simplefs_file_ei_block *) bh_new->b_data;
804804
for (ei = 0; new_pos < 0 && ei < SIMPLEFS_MAX_EXTENTS; ei++) {
805-
if (!eblock_new->extents[ei].ee_start)
805+
if (!eblk_dest->extents[ei].ee_start)
806806
break;
807807

808-
for (bi = 0; new_pos < 0 && bi < eblock_new->extents[ei].ee_len; bi++) {
809-
bh2 = sb_bread(sb, eblock_new->extents[ei].ee_start + bi);
808+
for (bi = 0; new_pos < 0 && bi < eblk_dest->extents[ei].ee_len; bi++) {
809+
bh2 = sb_bread(sb, eblk_dest->extents[ei].ee_start + bi);
810810
if (!bh2) {
811811
ret = -EIO;
812812
goto release_new;
@@ -816,13 +816,13 @@ static int simplefs_rename(struct inode *old_dir,
816816
int blk_nr_files = dblock->nr_files;
817817
for (fi = 0; blk_nr_files;) {
818818
/* src and target are the same dir (inode is same) */
819-
if (new_dir == old_dir) {
819+
if (dest_dir == src_dir) {
820820
if (dblock->files[fi].inode &&
821821
!strncmp(dblock->files[fi].filename,
822-
old_dentry->d_name.name,
822+
src_dentry->d_name.name,
823823
SIMPLEFS_FILENAME_LEN)) {
824824
strncpy(dblock->files[fi].filename,
825-
new_dentry->d_name.name, SIMPLEFS_FILENAME_LEN);
825+
dest_dentry->d_name.name, SIMPLEFS_FILENAME_LEN);
826826
mark_buffer_dirty(bh2);
827827
brelse(bh2);
828828
goto release_new;
@@ -832,7 +832,7 @@ static int simplefs_rename(struct inode *old_dir,
832832
same name in the target directory */
833833
if (dblock->files[fi].inode &&
834834
!strncmp(dblock->files[fi].filename,
835-
new_dentry->d_name.name,
835+
dest_dentry->d_name.name,
836836
SIMPLEFS_FILENAME_LEN)) {
837837
brelse(bh2);
838838
ret = -EEXIST;
@@ -852,7 +852,7 @@ static int simplefs_rename(struct inode *old_dir,
852852
}
853853

854854
/* If new directory is full, fail */
855-
if (new_pos < 0 && eblock_new->nr_files == SIMPLEFS_FILES_PER_EXT) {
855+
if (new_pos < 0 && eblk_dest->nr_files == SIMPLEFS_FILES_PER_EXT) {
856856
ret = -EMLINK;
857857
goto release_new;
858858
}
@@ -865,13 +865,13 @@ static int simplefs_rename(struct inode *old_dir,
865865
ret = -ENOSPC;
866866
goto release_new;
867867
}
868-
eblock_new->extents[ei].ee_start = bno;
869-
eblock_new->extents[ei].ee_len = SIMPLEFS_MAX_BLOCKS_PER_EXTENT;
870-
eblock_new->extents[ei].ee_block =
871-
ei ? eblock_new->extents[ei - 1].ee_block +
872-
eblock_new->extents[ei - 1].ee_len
868+
eblk_dest->extents[ei].ee_start = bno;
869+
eblk_dest->extents[ei].ee_len = SIMPLEFS_MAX_BLOCKS_PER_EXTENT;
870+
eblk_dest->extents[ei].ee_block =
871+
ei ? eblk_dest->extents[ei - 1].ee_block +
872+
eblk_dest->extents[ei - 1].ee_len
873873
: 0;
874-
bh2 = sb_bread(sb, eblock_new->extents[ei].ee_start + 0);
874+
bh2 = sb_bread(sb, eblk_dest->extents[ei].ee_start + 0);
875875
if (!bh2) {
876876
ret = -EIO;
877877
goto put_block;
@@ -881,55 +881,55 @@ static int simplefs_rename(struct inode *old_dir,
881881
new_pos = 0;
882882
}
883883
dblock->files[new_pos].inode = src->i_ino;
884-
strncpy(dblock->files[new_pos].filename, new_dentry->d_name.name,
884+
strncpy(dblock->files[new_pos].filename, dest_dentry->d_name.name,
885885
SIMPLEFS_FILENAME_LEN);
886886
mark_buffer_dirty(bh2);
887887
brelse(bh2);
888888

889889
/* Update new parent inode metadata */
890890
#if SIMPLEFS_AT_LEAST(6, 7, 0)
891-
simple_inode_init_ts(new_dir);
891+
simple_inode_init_ts(dest_dir);
892892
#elif SIMPLEFS_AT_LEAST(6, 6, 0)
893-
cur_time = current_time(new_dir);
894-
new_dir->i_atime = new_dir->i_mtime = cur_time;
895-
inode_set_ctime_to_ts(new_dir, cur_time);
893+
cur_time = current_time(dest_dir);
894+
dest_dir->i_atime = dest_dir->i_mtime = cur_time;
895+
inode_set_ctime_to_ts(dest_dir, cur_time);
896896
#else
897-
new_dir->i_atime = new_dir->i_ctime = new_dir->i_mtime =
898-
current_time(new_dir);
897+
dest_dir->i_atime = dest_dir->i_ctime = dest_dir->i_mtime =
898+
current_time(dest_dir);
899899
#endif
900900

901901
if (S_ISDIR(src->i_mode))
902-
inc_nlink(new_dir);
903-
mark_inode_dirty(new_dir);
902+
inc_nlink(dest_dir);
903+
mark_inode_dirty(dest_dir);
904904

905905
/* remove target from old parent directory */
906-
ret = simplefs_remove_from_dir(old_dir, old_dentry);
906+
ret = simplefs_remove_from_dir(src_dir, src_dentry);
907907
if (ret != 0)
908908
goto release_new;
909909

910910
/* Update old parent inode metadata */
911911
#if SIMPLEFS_AT_LEAST(6, 7, 0)
912-
simple_inode_init_ts(old_dir);
912+
simple_inode_init_ts(src_dir);
913913
#elif SIMPLEFS_AT_LEAST(6, 6, 0)
914-
cur_time = current_time(old_dir);
915-
old_dir->i_atime = old_dir->i_mtime = cur_time;
916-
inode_set_ctime_to_ts(old_dir, cur_time);
914+
cur_time = current_time(src_dir);
915+
src_dir->i_atime = src_dir->i_mtime = cur_time;
916+
inode_set_ctime_to_ts(src_dir, cur_time);
917917
#else
918-
old_dir->i_atime = old_dir->i_ctime = old_dir->i_mtime =
919-
current_time(old_dir);
918+
src_dir->i_atime = src_dir->i_ctime = src_dir->i_mtime =
919+
current_time(src_dir);
920920
#endif
921921

922922
if (S_ISDIR(src->i_mode))
923-
drop_nlink(old_dir);
924-
mark_inode_dirty(old_dir);
923+
drop_nlink(src_dir);
924+
mark_inode_dirty(src_dir);
925925

926926
return ret;
927927

928928
put_block:
929-
if (eblock_new->extents[ei].ee_start) {
930-
put_blocks(SIMPLEFS_SB(sb), eblock_new->extents[ei].ee_start,
931-
eblock_new->extents[ei].ee_len);
932-
memset(&eblock_new->extents[ei], 0, sizeof(struct simplefs_extent));
929+
if (eblk_dest->extents[ei].ee_start) {
930+
put_blocks(SIMPLEFS_SB(sb), eblk_dest->extents[ei].ee_start,
931+
eblk_dest->extents[ei].ee_len);
932+
memset(&eblk_dest->extents[ei], 0, sizeof(struct simplefs_extent));
933933
}
934934
release_new:
935935
brelse(bh_new);
@@ -996,11 +996,11 @@ static int simplefs_rmdir(struct inode *dir, struct dentry *dentry)
996996
return simplefs_unlink(dir, dentry);
997997
}
998998

999-
static int simplefs_link(struct dentry *old_dentry,
999+
static int simplefs_link(struct dentry *src_dentry,
10001000
struct inode *dir,
10011001
struct dentry *dentry)
10021002
{
1003-
struct inode *old_inode = d_inode(old_dentry);
1003+
struct inode *old_inode = d_inode(src_dentry);
10041004
struct super_block *sb = old_inode->i_sb;
10051005
struct simplefs_inode_info *ci_dir = SIMPLEFS_INODE(dir);
10061006
struct simplefs_file_ei_block *eblock = NULL;

0 commit comments

Comments
 (0)