Skip to content

Commit d190d31

Browse files
RoyWFHuangRoyWFHuang
committed
Rename variables for better readability
1 parent d969bb7 commit d190d31

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
@@ -741,31 +741,31 @@ static int simplefs_unlink(struct inode *dir, struct dentry *dentry)
741741

742742
#if SIMPLEFS_AT_LEAST(6, 3, 0)
743743
static int simplefs_rename(struct mnt_idmap *id,
744-
struct inode *old_dir,
745-
struct dentry *old_dentry,
746-
struct inode *new_dir,
747-
struct dentry *new_dentry,
744+
struct inode *src_dir,
745+
struct dentry *src_dentry,
746+
struct inode *dest_dir,
747+
struct dentry *dest_dentry,
748748
unsigned int flags)
749749
#elif SIMPLEFS_AT_LEAST(5, 12, 0)
750750
static int simplefs_rename(struct user_namespace *ns,
751-
struct inode *old_dir,
752-
struct dentry *old_dentry,
753-
struct inode *new_dir,
754-
struct dentry *new_dentry,
751+
struct inode *src_dir,
752+
struct dentry *src_dentry,
753+
struct inode *dest_dir,
754+
struct dentry *dest_dentry,
755755
unsigned int flags)
756756
#else
757-
static int simplefs_rename(struct inode *old_dir,
758-
struct dentry *old_dentry,
759-
struct inode *new_dir,
760-
struct dentry *new_dentry,
757+
static int simplefs_rename(struct inode *src_dir,
758+
struct dentry *src_dentry,
759+
struct inode *dest_dir,
760+
struct dentry *dest_dentry,
761761
unsigned int flags)
762762
#endif
763763
{
764-
struct super_block *sb = old_dir->i_sb;
765-
struct simplefs_inode_info *ci_new = SIMPLEFS_INODE(new_dir);
766-
struct inode *src = d_inode(old_dentry);
764+
struct super_block *sb = src_dir->i_sb;
765+
struct simplefs_inode_info *ci_dest = SIMPLEFS_INODE(dest_dir);
766+
struct inode *src = d_inode(src_dentry);
767767
struct buffer_head *bh_new = NULL, *bh2 = NULL;
768-
struct simplefs_file_ei_block *eblock_new = NULL;
768+
struct simplefs_file_ei_block *eblk_dest = NULL;
769769
struct simplefs_dir_block *dblock = NULL;
770770

771771
#if SIMPLEFS_AT_LEAST(6, 6, 0) && SIMPLEFS_LESS_EQUAL(6, 7, 0)
@@ -780,21 +780,21 @@ static int simplefs_rename(struct inode *old_dir,
780780
return -EINVAL;
781781

782782
/* Check if filename is not too long */
783-
if (strlen(new_dentry->d_name.name) > SIMPLEFS_FILENAME_LEN)
783+
if (strlen(dest_dentry->d_name.name) > SIMPLEFS_FILENAME_LEN)
784784
return -ENAMETOOLONG;
785785

786-
/* Fail if new_dentry exists or if new_dir is full */
787-
bh_new = sb_bread(sb, ci_new->ei_block);
786+
/* Fail if dest_dentry exists or if dest_dir is full */
787+
bh_new = sb_bread(sb, ci_dest->ei_block);
788788
if (!bh_new)
789789
return -EIO;
790790

791-
eblock_new = (struct simplefs_file_ei_block *) bh_new->b_data;
791+
eblk_dest = (struct simplefs_file_ei_block *) bh_new->b_data;
792792
for (ei = 0; new_pos < 0 && ei < SIMPLEFS_MAX_EXTENTS; ei++) {
793-
if (!eblock_new->extents[ei].ee_start)
793+
if (!eblk_dest->extents[ei].ee_start)
794794
break;
795795

796-
for (bi = 0; new_pos < 0 && bi < eblock_new->extents[ei].ee_len; bi++) {
797-
bh2 = sb_bread(sb, eblock_new->extents[ei].ee_start + bi);
796+
for (bi = 0; new_pos < 0 && bi < eblk_dest->extents[ei].ee_len; bi++) {
797+
bh2 = sb_bread(sb, eblk_dest->extents[ei].ee_start + bi);
798798
if (!bh2) {
799799
ret = -EIO;
800800
goto release_new;
@@ -804,13 +804,13 @@ static int simplefs_rename(struct inode *old_dir,
804804
int blk_nr_files = dblock->nr_files;
805805
for (fi = 0; blk_nr_files;) {
806806
/* src and target are the same dir (inode is same) */
807-
if (new_dir == old_dir) {
807+
if (dest_dir == src_dir) {
808808
if (dblock->files[fi].inode &&
809809
!strncmp(dblock->files[fi].filename,
810-
old_dentry->d_name.name,
810+
src_dentry->d_name.name,
811811
SIMPLEFS_FILENAME_LEN)) {
812812
strncpy(dblock->files[fi].filename,
813-
new_dentry->d_name.name, SIMPLEFS_FILENAME_LEN);
813+
dest_dentry->d_name.name, SIMPLEFS_FILENAME_LEN);
814814
mark_buffer_dirty(bh2);
815815
brelse(bh2);
816816
goto release_new;
@@ -820,7 +820,7 @@ static int simplefs_rename(struct inode *old_dir,
820820
same name in the target directory */
821821
if (dblock->files[fi].inode &&
822822
!strncmp(dblock->files[fi].filename,
823-
new_dentry->d_name.name,
823+
dest_dentry->d_name.name,
824824
SIMPLEFS_FILENAME_LEN)) {
825825
brelse(bh2);
826826
ret = -EEXIST;
@@ -840,7 +840,7 @@ static int simplefs_rename(struct inode *old_dir,
840840
}
841841

842842
/* If new directory is full, fail */
843-
if (new_pos < 0 && eblock_new->nr_files == SIMPLEFS_FILES_PER_EXT) {
843+
if (new_pos < 0 && eblk_dest->nr_files == SIMPLEFS_FILES_PER_EXT) {
844844
ret = -EMLINK;
845845
goto release_new;
846846
}
@@ -853,13 +853,13 @@ static int simplefs_rename(struct inode *old_dir,
853853
ret = -ENOSPC;
854854
goto release_new;
855855
}
856-
eblock_new->extents[ei].ee_start = bno;
857-
eblock_new->extents[ei].ee_len = SIMPLEFS_MAX_BLOCKS_PER_EXTENT;
858-
eblock_new->extents[ei].ee_block =
859-
ei ? eblock_new->extents[ei - 1].ee_block +
860-
eblock_new->extents[ei - 1].ee_len
856+
eblk_dest->extents[ei].ee_start = bno;
857+
eblk_dest->extents[ei].ee_len = SIMPLEFS_MAX_BLOCKS_PER_EXTENT;
858+
eblk_dest->extents[ei].ee_block =
859+
ei ? eblk_dest->extents[ei - 1].ee_block +
860+
eblk_dest->extents[ei - 1].ee_len
861861
: 0;
862-
bh2 = sb_bread(sb, eblock_new->extents[ei].ee_start + 0);
862+
bh2 = sb_bread(sb, eblk_dest->extents[ei].ee_start + 0);
863863
if (!bh2) {
864864
ret = -EIO;
865865
goto put_block;
@@ -869,55 +869,55 @@ static int simplefs_rename(struct inode *old_dir,
869869
new_pos = 0;
870870
}
871871
dblock->files[new_pos].inode = src->i_ino;
872-
strncpy(dblock->files[new_pos].filename, new_dentry->d_name.name,
872+
strncpy(dblock->files[new_pos].filename, dest_dentry->d_name.name,
873873
SIMPLEFS_FILENAME_LEN);
874874
mark_buffer_dirty(bh2);
875875
brelse(bh2);
876876

877877
/* Update new parent inode metadata */
878878
#if SIMPLEFS_AT_LEAST(6, 7, 0)
879-
simple_inode_init_ts(new_dir);
879+
simple_inode_init_ts(dest_dir);
880880
#elif SIMPLEFS_AT_LEAST(6, 6, 0)
881-
cur_time = current_time(new_dir);
882-
new_dir->i_atime = new_dir->i_mtime = cur_time;
883-
inode_set_ctime_to_ts(new_dir, cur_time);
881+
cur_time = current_time(dest_dir);
882+
dest_dir->i_atime = dest_dir->i_mtime = cur_time;
883+
inode_set_ctime_to_ts(dest_dir, cur_time);
884884
#else
885-
new_dir->i_atime = new_dir->i_ctime = new_dir->i_mtime =
886-
current_time(new_dir);
885+
dest_dir->i_atime = dest_dir->i_ctime = dest_dir->i_mtime =
886+
current_time(dest_dir);
887887
#endif
888888

889889
if (S_ISDIR(src->i_mode))
890-
inc_nlink(new_dir);
891-
mark_inode_dirty(new_dir);
890+
inc_nlink(dest_dir);
891+
mark_inode_dirty(dest_dir);
892892

893893
/* remove target from old parent directory */
894-
ret = simplefs_remove_from_dir(old_dir, old_dentry);
894+
ret = simplefs_remove_from_dir(src_dir, src_dentry);
895895
if (ret != 0)
896896
goto release_new;
897897

898898
/* Update old parent inode metadata */
899899
#if SIMPLEFS_AT_LEAST(6, 7, 0)
900-
simple_inode_init_ts(old_dir);
900+
simple_inode_init_ts(src_dir);
901901
#elif SIMPLEFS_AT_LEAST(6, 6, 0)
902-
cur_time = current_time(old_dir);
903-
old_dir->i_atime = old_dir->i_mtime = cur_time;
904-
inode_set_ctime_to_ts(old_dir, cur_time);
902+
cur_time = current_time(src_dir);
903+
src_dir->i_atime = src_dir->i_mtime = cur_time;
904+
inode_set_ctime_to_ts(src_dir, cur_time);
905905
#else
906-
old_dir->i_atime = old_dir->i_ctime = old_dir->i_mtime =
907-
current_time(old_dir);
906+
src_dir->i_atime = src_dir->i_ctime = src_dir->i_mtime =
907+
current_time(src_dir);
908908
#endif
909909

910910
if (S_ISDIR(src->i_mode))
911-
drop_nlink(old_dir);
912-
mark_inode_dirty(old_dir);
911+
drop_nlink(src_dir);
912+
mark_inode_dirty(src_dir);
913913

914914
return ret;
915915

916916
put_block:
917-
if (eblock_new->extents[ei].ee_start) {
918-
put_blocks(SIMPLEFS_SB(sb), eblock_new->extents[ei].ee_start,
919-
eblock_new->extents[ei].ee_len);
920-
memset(&eblock_new->extents[ei], 0, sizeof(struct simplefs_extent));
917+
if (eblk_dest->extents[ei].ee_start) {
918+
put_blocks(SIMPLEFS_SB(sb), eblk_dest->extents[ei].ee_start,
919+
eblk_dest->extents[ei].ee_len);
920+
memset(&eblk_dest->extents[ei], 0, sizeof(struct simplefs_extent));
921921
}
922922
release_new:
923923
brelse(bh_new);
@@ -975,11 +975,11 @@ static int simplefs_rmdir(struct inode *dir, struct dentry *dentry)
975975
return simplefs_unlink(dir, dentry);
976976
}
977977

978-
static int simplefs_link(struct dentry *old_dentry,
978+
static int simplefs_link(struct dentry *src_dentry,
979979
struct inode *dir,
980980
struct dentry *dentry)
981981
{
982-
struct inode *old_inode = d_inode(old_dentry);
982+
struct inode *old_inode = d_inode(src_dentry);
983983
struct super_block *sb = old_inode->i_sb;
984984
struct simplefs_inode_info *ci_dir = SIMPLEFS_INODE(dir);
985985
struct simplefs_file_ei_block *eblock = NULL;

0 commit comments

Comments
 (0)