Skip to content

Commit c71510b

Browse files
YuezhangMonamjaejeon
YuezhangMo
authored and
namjaejeon
committed
exfat: remove argument 'sector' from exfat_get_dentry()
No any function uses argument 'sector', remove it. Reviewed-by: Andy.Wu <[email protected]> Reviewed-by: Aoyama, Wataru <[email protected]> Acked-by: Sungjong Seo <[email protected]> Signed-off-by: Yuezhang.Mo <[email protected]> Signed-off-by: Namjae Jeon <[email protected]>
1 parent 1ed147e commit c71510b

File tree

5 files changed

+33
-52
lines changed

5 files changed

+33
-52
lines changed

‎fs/exfat/balloc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ int exfat_load_bitmap(struct super_block *sb)
105105
struct exfat_dentry *ep;
106106
struct buffer_head *bh;
107107

108-
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
108+
ep = exfat_get_dentry(sb, &clu, i, &bh);
109109
if (!ep)
110110
return -EIO;
111111

‎fs/exfat/dir.c‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent
6464
{
6565
int i, dentries_per_clu, dentries_per_clu_bits = 0, num_ext;
6666
unsigned int type, clu_offset, max_dentries;
67-
sector_t sector;
6867
struct exfat_chain dir, clu;
6968
struct exfat_uni_name uni_name;
7069
struct exfat_dentry *ep;
@@ -115,7 +114,7 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent
115114
i = dentry & (dentries_per_clu - 1);
116115

117116
for ( ; i < dentries_per_clu; i++, dentry++) {
118-
ep = exfat_get_dentry(sb, &clu, i, &bh, &sector);
117+
ep = exfat_get_dentry(sb, &clu, i, &bh);
119118
if (!ep)
120119
return -EIO;
121120

@@ -156,7 +155,7 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent
156155
dir_entry->namebuf.lfnbuf_len);
157156
brelse(bh);
158157

159-
ep = exfat_get_dentry(sb, &clu, i + 1, &bh, NULL);
158+
ep = exfat_get_dentry(sb, &clu, i + 1, &bh);
160159
if (!ep)
161160
return -EIO;
162161
dir_entry->size =
@@ -445,15 +444,14 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,
445444
struct super_block *sb = inode->i_sb;
446445
struct exfat_sb_info *sbi = EXFAT_SB(sb);
447446
struct timespec64 ts = current_time(inode);
448-
sector_t sector;
449447
struct exfat_dentry *ep;
450448
struct buffer_head *bh;
451449

452450
/*
453451
* We cannot use exfat_get_dentry_set here because file ep is not
454452
* initialized yet.
455453
*/
456-
ep = exfat_get_dentry(sb, p_dir, entry, &bh, &sector);
454+
ep = exfat_get_dentry(sb, p_dir, entry, &bh);
457455
if (!ep)
458456
return -EIO;
459457

@@ -477,7 +475,7 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,
477475
exfat_update_bh(bh, IS_DIRSYNC(inode));
478476
brelse(bh);
479477

480-
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh, &sector);
478+
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh);
481479
if (!ep)
482480
return -EIO;
483481

@@ -496,20 +494,19 @@ int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir,
496494
struct super_block *sb = inode->i_sb;
497495
int ret = 0;
498496
int i, num_entries;
499-
sector_t sector;
500497
u16 chksum;
501498
struct exfat_dentry *ep, *fep;
502499
struct buffer_head *fbh, *bh;
503500

504-
fep = exfat_get_dentry(sb, p_dir, entry, &fbh, &sector);
501+
fep = exfat_get_dentry(sb, p_dir, entry, &fbh);
505502
if (!fep)
506503
return -EIO;
507504

508505
num_entries = fep->dentry.file.num_ext + 1;
509506
chksum = exfat_calc_chksum16(fep, DENTRY_SIZE, 0, CS_DIR_ENTRY);
510507

511508
for (i = 1; i < num_entries; i++) {
512-
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh, NULL);
509+
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);
513510
if (!ep) {
514511
ret = -EIO;
515512
goto release_fbh;
@@ -531,21 +528,20 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
531528
{
532529
struct super_block *sb = inode->i_sb;
533530
int i;
534-
sector_t sector;
535531
unsigned short *uniname = p_uniname->name;
536532
struct exfat_dentry *ep;
537533
struct buffer_head *bh;
538534
int sync = IS_DIRSYNC(inode);
539535

540-
ep = exfat_get_dentry(sb, p_dir, entry, &bh, &sector);
536+
ep = exfat_get_dentry(sb, p_dir, entry, &bh);
541537
if (!ep)
542538
return -EIO;
543539

544540
ep->dentry.file.num_ext = (unsigned char)(num_entries - 1);
545541
exfat_update_bh(bh, sync);
546542
brelse(bh);
547543

548-
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh, &sector);
544+
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh);
549545
if (!ep)
550546
return -EIO;
551547

@@ -555,7 +551,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
555551
brelse(bh);
556552

557553
for (i = EXFAT_FIRST_CLUSTER; i < num_entries; i++) {
558-
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh, &sector);
554+
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);
559555
if (!ep)
560556
return -EIO;
561557

@@ -574,12 +570,11 @@ int exfat_remove_entries(struct inode *inode, struct exfat_chain *p_dir,
574570
{
575571
struct super_block *sb = inode->i_sb;
576572
int i;
577-
sector_t sector;
578573
struct exfat_dentry *ep;
579574
struct buffer_head *bh;
580575

581576
for (i = order; i < num_entries; i++) {
582-
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh, &sector);
577+
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);
583578
if (!ep)
584579
return -EIO;
585580

@@ -717,8 +712,7 @@ static int exfat_dir_readahead(struct super_block *sb, sector_t sec)
717712
}
718713

719714
struct exfat_dentry *exfat_get_dentry(struct super_block *sb,
720-
struct exfat_chain *p_dir, int entry, struct buffer_head **bh,
721-
sector_t *sector)
715+
struct exfat_chain *p_dir, int entry, struct buffer_head **bh)
722716
{
723717
unsigned int dentries_per_page = EXFAT_B_TO_DEN(PAGE_SIZE);
724718
int off;
@@ -740,8 +734,6 @@ struct exfat_dentry *exfat_get_dentry(struct super_block *sb,
740734
if (!*bh)
741735
return NULL;
742736

743-
if (sector)
744-
*sector = sec;
745737
return (struct exfat_dentry *)((*bh)->b_data + off);
746738
}
747739

@@ -960,7 +952,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,
960952
if (rewind && dentry == end_eidx)
961953
goto not_found;
962954

963-
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
955+
ep = exfat_get_dentry(sb, &clu, i, &bh);
964956
if (!ep)
965957
return -EIO;
966958

@@ -1145,7 +1137,7 @@ int exfat_count_ext_entries(struct super_block *sb, struct exfat_chain *p_dir,
11451137
struct buffer_head *bh;
11461138

11471139
for (i = 0, entry++; i < ep->dentry.file.num_ext; i++, entry++) {
1148-
ext_ep = exfat_get_dentry(sb, p_dir, entry, &bh, NULL);
1140+
ext_ep = exfat_get_dentry(sb, p_dir, entry, &bh);
11491141
if (!ext_ep)
11501142
return -EIO;
11511143

@@ -1175,7 +1167,7 @@ int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir)
11751167

11761168
while (clu.dir != EXFAT_EOF_CLUSTER) {
11771169
for (i = 0; i < dentries_per_clu; i++) {
1178-
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
1170+
ep = exfat_get_dentry(sb, &clu, i, &bh);
11791171
if (!ep)
11801172
return -EIO;
11811173
entry_type = exfat_get_entry_type(ep);

‎fs/exfat/exfat_fs.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,
459459
int num_entries, unsigned int type, struct exfat_hint *hint_opt);
460460
int exfat_alloc_new_dir(struct inode *inode, struct exfat_chain *clu);
461461
struct exfat_dentry *exfat_get_dentry(struct super_block *sb,
462-
struct exfat_chain *p_dir, int entry, struct buffer_head **bh,
463-
sector_t *sector);
462+
struct exfat_chain *p_dir, int entry, struct buffer_head **bh);
464463
struct exfat_dentry *exfat_get_dentry_cached(struct exfat_entry_set_cache *es,
465464
int num);
466465
struct exfat_entry_set_cache *exfat_get_dentry_set(struct super_block *sb,

‎fs/exfat/namei.c‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ static int exfat_search_empty_slot(struct super_block *sb,
229229
i = dentry & (dentries_per_clu - 1);
230230

231231
for (; i < dentries_per_clu; i++, dentry++) {
232-
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
232+
ep = exfat_get_dentry(sb, &clu, i, &bh);
233233
if (!ep)
234234
return -EIO;
235235
type = exfat_get_entry_type(ep);
@@ -306,7 +306,6 @@ static int exfat_find_empty_entry(struct inode *inode,
306306
{
307307
int dentry;
308308
unsigned int ret, last_clu;
309-
sector_t sector;
310309
loff_t size = 0;
311310
struct exfat_chain clu;
312311
struct exfat_dentry *ep = NULL;
@@ -379,7 +378,7 @@ static int exfat_find_empty_entry(struct inode *inode,
379378
struct buffer_head *bh;
380379

381380
ep = exfat_get_dentry(sb,
382-
&(ei->dir), ei->entry + 1, &bh, &sector);
381+
&(ei->dir), ei->entry + 1, &bh);
383382
if (!ep)
384383
return -EIO;
385384

@@ -779,7 +778,6 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
779778
struct inode *inode = dentry->d_inode;
780779
struct exfat_inode_info *ei = EXFAT_I(inode);
781780
struct buffer_head *bh;
782-
sector_t sector;
783781
int num_entries, entry, err = 0;
784782

785783
mutex_lock(&EXFAT_SB(sb)->s_lock);
@@ -791,7 +789,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
791789
goto unlock;
792790
}
793791

794-
ep = exfat_get_dentry(sb, &cdir, entry, &bh, &sector);
792+
ep = exfat_get_dentry(sb, &cdir, entry, &bh);
795793
if (!ep) {
796794
err = -EIO;
797795
goto unlock;
@@ -895,7 +893,7 @@ static int exfat_check_dir_empty(struct super_block *sb,
895893

896894
while (clu.dir != EXFAT_EOF_CLUSTER) {
897895
for (i = 0; i < dentries_per_clu; i++) {
898-
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
896+
ep = exfat_get_dentry(sb, &clu, i, &bh);
899897
if (!ep)
900898
return -EIO;
901899
type = exfat_get_entry_type(ep);
@@ -932,7 +930,6 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
932930
struct exfat_sb_info *sbi = EXFAT_SB(sb);
933931
struct exfat_inode_info *ei = EXFAT_I(inode);
934932
struct buffer_head *bh;
935-
sector_t sector;
936933
int num_entries, entry, err;
937934

938935
mutex_lock(&EXFAT_SB(inode->i_sb)->s_lock);
@@ -957,7 +954,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
957954
goto unlock;
958955
}
959956

960-
ep = exfat_get_dentry(sb, &cdir, entry, &bh, &sector);
957+
ep = exfat_get_dentry(sb, &cdir, entry, &bh);
961958
if (!ep) {
962959
err = -EIO;
963960
goto unlock;
@@ -1005,13 +1002,12 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
10051002
struct exfat_inode_info *ei)
10061003
{
10071004
int ret, num_old_entries, num_new_entries;
1008-
sector_t sector_old, sector_new;
10091005
struct exfat_dentry *epold, *epnew;
10101006
struct super_block *sb = inode->i_sb;
10111007
struct buffer_head *new_bh, *old_bh;
10121008
int sync = IS_DIRSYNC(inode);
10131009

1014-
epold = exfat_get_dentry(sb, p_dir, oldentry, &old_bh, &sector_old);
1010+
epold = exfat_get_dentry(sb, p_dir, oldentry, &old_bh);
10151011
if (!epold)
10161012
return -EIO;
10171013

@@ -1032,8 +1028,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
10321028
if (newentry < 0)
10331029
return newentry; /* -EIO or -ENOSPC */
10341030

1035-
epnew = exfat_get_dentry(sb, p_dir, newentry, &new_bh,
1036-
&sector_new);
1031+
epnew = exfat_get_dentry(sb, p_dir, newentry, &new_bh);
10371032
if (!epnew)
10381033
return -EIO;
10391034

@@ -1046,12 +1041,10 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
10461041
brelse(old_bh);
10471042
brelse(new_bh);
10481043

1049-
epold = exfat_get_dentry(sb, p_dir, oldentry + 1, &old_bh,
1050-
&sector_old);
1044+
epold = exfat_get_dentry(sb, p_dir, oldentry + 1, &old_bh);
10511045
if (!epold)
10521046
return -EIO;
1053-
epnew = exfat_get_dentry(sb, p_dir, newentry + 1, &new_bh,
1054-
&sector_new);
1047+
epnew = exfat_get_dentry(sb, p_dir, newentry + 1, &new_bh);
10551048
if (!epnew) {
10561049
brelse(old_bh);
10571050
return -EIO;
@@ -1093,12 +1086,11 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
10931086
struct exfat_uni_name *p_uniname, struct exfat_inode_info *ei)
10941087
{
10951088
int ret, newentry, num_new_entries, num_old_entries;
1096-
sector_t sector_mov, sector_new;
10971089
struct exfat_dentry *epmov, *epnew;
10981090
struct super_block *sb = inode->i_sb;
10991091
struct buffer_head *mov_bh, *new_bh;
11001092

1101-
epmov = exfat_get_dentry(sb, p_olddir, oldentry, &mov_bh, &sector_mov);
1093+
epmov = exfat_get_dentry(sb, p_olddir, oldentry, &mov_bh);
11021094
if (!epmov)
11031095
return -EIO;
11041096

@@ -1116,7 +1108,7 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
11161108
if (newentry < 0)
11171109
return newentry; /* -EIO or -ENOSPC */
11181110

1119-
epnew = exfat_get_dentry(sb, p_newdir, newentry, &new_bh, &sector_new);
1111+
epnew = exfat_get_dentry(sb, p_newdir, newentry, &new_bh);
11201112
if (!epnew)
11211113
return -EIO;
11221114

@@ -1129,12 +1121,10 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
11291121
brelse(mov_bh);
11301122
brelse(new_bh);
11311123

1132-
epmov = exfat_get_dentry(sb, p_olddir, oldentry + 1, &mov_bh,
1133-
&sector_mov);
1124+
epmov = exfat_get_dentry(sb, p_olddir, oldentry + 1, &mov_bh);
11341125
if (!epmov)
11351126
return -EIO;
1136-
epnew = exfat_get_dentry(sb, p_newdir, newentry + 1, &new_bh,
1137-
&sector_new);
1127+
epnew = exfat_get_dentry(sb, p_newdir, newentry + 1, &new_bh);
11381128
if (!epnew) {
11391129
brelse(mov_bh);
11401130
return -EIO;
@@ -1216,7 +1206,7 @@ static int __exfat_rename(struct inode *old_parent_inode,
12161206
exfat_chain_dup(&olddir, &ei->dir);
12171207
dentry = ei->entry;
12181208

1219-
ep = exfat_get_dentry(sb, &olddir, dentry, &old_bh, NULL);
1209+
ep = exfat_get_dentry(sb, &olddir, dentry, &old_bh);
12201210
if (!ep) {
12211211
ret = -EIO;
12221212
goto out;
@@ -1237,7 +1227,7 @@ static int __exfat_rename(struct inode *old_parent_inode,
12371227

12381228
p_dir = &(new_ei->dir);
12391229
new_entry = new_ei->entry;
1240-
ep = exfat_get_dentry(sb, p_dir, new_entry, &new_bh, NULL);
1230+
ep = exfat_get_dentry(sb, p_dir, new_entry, &new_bh);
12411231
if (!ep)
12421232
goto out;
12431233

@@ -1277,7 +1267,7 @@ static int __exfat_rename(struct inode *old_parent_inode,
12771267

12781268
if (!ret && new_inode) {
12791269
/* delete entries of new_dir */
1280-
ep = exfat_get_dentry(sb, p_dir, new_entry, &new_bh, NULL);
1270+
ep = exfat_get_dentry(sb, p_dir, new_entry, &new_bh);
12811271
if (!ep) {
12821272
ret = -EIO;
12831273
goto del_out;

‎fs/exfat/nls.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ int exfat_create_upcase_table(struct super_block *sb)
761761

762762
while (clu.dir != EXFAT_EOF_CLUSTER) {
763763
for (i = 0; i < sbi->dentries_per_clu; i++) {
764-
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
764+
ep = exfat_get_dentry(sb, &clu, i, &bh);
765765
if (!ep)
766766
return -EIO;
767767

0 commit comments

Comments
 (0)