exfat: remove argument 'sector' from exfat_get_dentry()
No any function uses argument 'sector', remove it. Reviewed-by: Andy.Wu <Andy.Wu@sony.com> Reviewed-by: Aoyama, Wataru <wataru.aoyama@sony.com> Signed-off-by: Yuezhang.Mo <Yuezhang.Mo@sony.com> Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
This commit is contained in:
Yuezhang.Mo
Namjae Jeon
parent
ca48c0eb7c
commit
216624a0cd
2
balloc.c
2
balloc.c
@ -109,7 +109,7 @@ int exfat_load_bitmap(struct super_block *sb)
|
||||
struct exfat_dentry *ep;
|
||||
struct buffer_head *bh;
|
||||
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
|
||||
|
||||
36
dir.c
36
dir.c
@ -65,7 +65,6 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent
|
||||
{
|
||||
int i, dentries_per_clu, dentries_per_clu_bits = 0, num_ext;
|
||||
unsigned int type, clu_offset, max_dentries;
|
||||
sector_t sector;
|
||||
struct exfat_chain dir, clu;
|
||||
struct exfat_uni_name uni_name;
|
||||
struct exfat_dentry *ep;
|
||||
@ -116,7 +115,7 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent
|
||||
i = dentry & (dentries_per_clu - 1);
|
||||
|
||||
for ( ; i < dentries_per_clu; i++, dentry++) {
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh, §or);
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
|
||||
@ -157,7 +156,7 @@ static int exfat_readdir(struct inode *inode, loff_t *cpos, struct exfat_dir_ent
|
||||
dir_entry->namebuf.lfnbuf_len);
|
||||
brelse(bh);
|
||||
|
||||
ep = exfat_get_dentry(sb, &clu, i + 1, &bh, NULL);
|
||||
ep = exfat_get_dentry(sb, &clu, i + 1, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
dir_entry->size =
|
||||
@ -450,7 +449,6 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
#else
|
||||
struct timespec ts;
|
||||
#endif
|
||||
sector_t sector;
|
||||
struct exfat_dentry *ep;
|
||||
struct buffer_head *bh;
|
||||
|
||||
@ -464,7 +462,7 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
* We cannot use exfat_get_dentry_set here because file ep is not
|
||||
* initialized yet.
|
||||
*/
|
||||
ep = exfat_get_dentry(sb, p_dir, entry, &bh, §or);
|
||||
ep = exfat_get_dentry(sb, p_dir, entry, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
|
||||
@ -488,7 +486,7 @@ int exfat_init_dir_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
exfat_update_bh(bh, IS_DIRSYNC(inode));
|
||||
brelse(bh);
|
||||
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh, §or);
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
|
||||
@ -507,12 +505,11 @@ int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir,
|
||||
struct super_block *sb = inode->i_sb;
|
||||
int ret = 0;
|
||||
int i, num_entries;
|
||||
sector_t sector;
|
||||
u16 chksum;
|
||||
struct exfat_dentry *ep, *fep;
|
||||
struct buffer_head *fbh, *bh;
|
||||
|
||||
fep = exfat_get_dentry(sb, p_dir, entry, &fbh, §or);
|
||||
fep = exfat_get_dentry(sb, p_dir, entry, &fbh);
|
||||
if (!fep)
|
||||
return -EIO;
|
||||
|
||||
@ -520,7 +517,7 @@ int exfat_update_dir_chksum(struct inode *inode, struct exfat_chain *p_dir,
|
||||
chksum = exfat_calc_chksum16(fep, DENTRY_SIZE, 0, CS_DIR_ENTRY);
|
||||
|
||||
for (i = 1; i < num_entries; i++) {
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh, NULL);
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);
|
||||
if (!ep) {
|
||||
ret = -EIO;
|
||||
goto release_fbh;
|
||||
@ -542,13 +539,12 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
{
|
||||
struct super_block *sb = inode->i_sb;
|
||||
int i;
|
||||
sector_t sector;
|
||||
unsigned short *uniname = p_uniname->name;
|
||||
struct exfat_dentry *ep;
|
||||
struct buffer_head *bh;
|
||||
int sync = IS_DIRSYNC(inode);
|
||||
|
||||
ep = exfat_get_dentry(sb, p_dir, entry, &bh, §or);
|
||||
ep = exfat_get_dentry(sb, p_dir, entry, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
|
||||
@ -556,7 +552,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
exfat_update_bh(bh, sync);
|
||||
brelse(bh);
|
||||
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh, §or);
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + 1, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
|
||||
@ -566,7 +562,7 @@ int exfat_init_ext_entry(struct inode *inode, struct exfat_chain *p_dir,
|
||||
brelse(bh);
|
||||
|
||||
for (i = EXFAT_FIRST_CLUSTER; i < num_entries; i++) {
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh, §or);
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
|
||||
@ -585,12 +581,11 @@ int exfat_remove_entries(struct inode *inode, struct exfat_chain *p_dir,
|
||||
{
|
||||
struct super_block *sb = inode->i_sb;
|
||||
int i;
|
||||
sector_t sector;
|
||||
struct exfat_dentry *ep;
|
||||
struct buffer_head *bh;
|
||||
|
||||
for (i = order; i < num_entries; i++) {
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh, §or);
|
||||
ep = exfat_get_dentry(sb, p_dir, entry + i, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
|
||||
@ -728,8 +723,7 @@ static int exfat_dir_readahead(struct super_block *sb, sector_t sec)
|
||||
}
|
||||
|
||||
struct exfat_dentry *exfat_get_dentry(struct super_block *sb,
|
||||
struct exfat_chain *p_dir, int entry, struct buffer_head **bh,
|
||||
sector_t *sector)
|
||||
struct exfat_chain *p_dir, int entry, struct buffer_head **bh)
|
||||
{
|
||||
unsigned int dentries_per_page = EXFAT_B_TO_DEN(PAGE_SIZE);
|
||||
int off;
|
||||
@ -751,8 +745,6 @@ struct exfat_dentry *exfat_get_dentry(struct super_block *sb,
|
||||
if (!*bh)
|
||||
return NULL;
|
||||
|
||||
if (sector)
|
||||
*sector = sec;
|
||||
return (struct exfat_dentry *)((*bh)->b_data + off);
|
||||
}
|
||||
|
||||
@ -971,7 +963,7 @@ rewind:
|
||||
if (rewind && dentry == end_eidx)
|
||||
goto not_found;
|
||||
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
|
||||
@ -1156,7 +1148,7 @@ int exfat_count_ext_entries(struct super_block *sb, struct exfat_chain *p_dir,
|
||||
struct buffer_head *bh;
|
||||
|
||||
for (i = 0, entry++; i < ep->dentry.file.num_ext; i++, entry++) {
|
||||
ext_ep = exfat_get_dentry(sb, p_dir, entry, &bh, NULL);
|
||||
ext_ep = exfat_get_dentry(sb, p_dir, entry, &bh);
|
||||
if (!ext_ep)
|
||||
return -EIO;
|
||||
|
||||
@ -1186,7 +1178,7 @@ int exfat_count_dir_entries(struct super_block *sb, struct exfat_chain *p_dir)
|
||||
|
||||
while (clu.dir != EXFAT_EOF_CLUSTER) {
|
||||
for (i = 0; i < dentries_per_clu; i++) {
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
entry_type = exfat_get_entry_type(ep);
|
||||
|
||||
@ -486,8 +486,7 @@ int exfat_find_dir_entry(struct super_block *sb, struct exfat_inode_info *ei,
|
||||
int num_entries, unsigned int type, struct exfat_hint *hint_opt);
|
||||
int exfat_alloc_new_dir(struct inode *inode, struct exfat_chain *clu);
|
||||
struct exfat_dentry *exfat_get_dentry(struct super_block *sb,
|
||||
struct exfat_chain *p_dir, int entry, struct buffer_head **bh,
|
||||
sector_t *sector);
|
||||
struct exfat_chain *p_dir, int entry, struct buffer_head **bh);
|
||||
struct exfat_dentry *exfat_get_dentry_cached(struct exfat_entry_set_cache *es,
|
||||
int num);
|
||||
struct exfat_entry_set_cache *exfat_get_dentry_set(struct super_block *sb,
|
||||
|
||||
42
namei.c
42
namei.c
@ -256,7 +256,7 @@ static int exfat_search_empty_slot(struct super_block *sb,
|
||||
i = dentry & (dentries_per_clu - 1);
|
||||
|
||||
for (; i < dentries_per_clu; i++, dentry++) {
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
type = exfat_get_entry_type(ep);
|
||||
@ -333,7 +333,6 @@ static int exfat_find_empty_entry(struct inode *inode,
|
||||
{
|
||||
int dentry;
|
||||
unsigned int ret, last_clu;
|
||||
sector_t sector;
|
||||
loff_t size = 0;
|
||||
struct exfat_chain clu;
|
||||
struct exfat_dentry *ep = NULL;
|
||||
@ -406,7 +405,7 @@ static int exfat_find_empty_entry(struct inode *inode,
|
||||
struct buffer_head *bh;
|
||||
|
||||
ep = exfat_get_dentry(sb,
|
||||
&(ei->dir), ei->entry + 1, &bh, §or);
|
||||
&(ei->dir), ei->entry + 1, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
|
||||
@ -841,7 +840,6 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
|
||||
struct inode *inode = dentry->d_inode;
|
||||
struct exfat_inode_info *ei = EXFAT_I(inode);
|
||||
struct buffer_head *bh;
|
||||
sector_t sector;
|
||||
int num_entries, entry, err = 0;
|
||||
|
||||
mutex_lock(&EXFAT_SB(sb)->s_lock);
|
||||
@ -853,7 +851,7 @@ static int exfat_unlink(struct inode *dir, struct dentry *dentry)
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
ep = exfat_get_dentry(sb, &cdir, entry, &bh, §or);
|
||||
ep = exfat_get_dentry(sb, &cdir, entry, &bh);
|
||||
if (!ep) {
|
||||
err = -EIO;
|
||||
goto unlock;
|
||||
@ -995,7 +993,7 @@ static int exfat_check_dir_empty(struct super_block *sb,
|
||||
|
||||
while (clu.dir != EXFAT_EOF_CLUSTER) {
|
||||
for (i = 0; i < dentries_per_clu; i++) {
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh, NULL);
|
||||
ep = exfat_get_dentry(sb, &clu, i, &bh);
|
||||
if (!ep)
|
||||
return -EIO;
|
||||
type = exfat_get_entry_type(ep);
|
||||
@ -1032,7 +1030,6 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
|
||||
struct exfat_sb_info *sbi = EXFAT_SB(sb);
|
||||
struct exfat_inode_info *ei = EXFAT_I(inode);
|
||||
struct buffer_head *bh;
|
||||
sector_t sector;
|
||||
int num_entries, entry, err;
|
||||
|
||||
mutex_lock(&EXFAT_SB(inode->i_sb)->s_lock);
|
||||
@ -1057,7 +1054,7 @@ static int exfat_rmdir(struct inode *dir, struct dentry *dentry)
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
ep = exfat_get_dentry(sb, &cdir, entry, &bh, §or);
|
||||
ep = exfat_get_dentry(sb, &cdir, entry, &bh);
|
||||
if (!ep) {
|
||||
err = -EIO;
|
||||
goto unlock;
|
||||
@ -1121,13 +1118,12 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
|
||||
struct exfat_inode_info *ei)
|
||||
{
|
||||
int ret, num_old_entries, num_new_entries;
|
||||
sector_t sector_old, sector_new;
|
||||
struct exfat_dentry *epold, *epnew;
|
||||
struct super_block *sb = inode->i_sb;
|
||||
struct buffer_head *new_bh, *old_bh;
|
||||
int sync = IS_DIRSYNC(inode);
|
||||
|
||||
epold = exfat_get_dentry(sb, p_dir, oldentry, &old_bh, §or_old);
|
||||
epold = exfat_get_dentry(sb, p_dir, oldentry, &old_bh);
|
||||
if (!epold)
|
||||
return -EIO;
|
||||
|
||||
@ -1148,8 +1144,7 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
|
||||
if (newentry < 0)
|
||||
return newentry; /* -EIO or -ENOSPC */
|
||||
|
||||
epnew = exfat_get_dentry(sb, p_dir, newentry, &new_bh,
|
||||
§or_new);
|
||||
epnew = exfat_get_dentry(sb, p_dir, newentry, &new_bh);
|
||||
if (!epnew)
|
||||
return -EIO;
|
||||
|
||||
@ -1162,12 +1157,10 @@ static int exfat_rename_file(struct inode *inode, struct exfat_chain *p_dir,
|
||||
brelse(old_bh);
|
||||
brelse(new_bh);
|
||||
|
||||
epold = exfat_get_dentry(sb, p_dir, oldentry + 1, &old_bh,
|
||||
§or_old);
|
||||
epold = exfat_get_dentry(sb, p_dir, oldentry + 1, &old_bh);
|
||||
if (!epold)
|
||||
return -EIO;
|
||||
epnew = exfat_get_dentry(sb, p_dir, newentry + 1, &new_bh,
|
||||
§or_new);
|
||||
epnew = exfat_get_dentry(sb, p_dir, newentry + 1, &new_bh);
|
||||
if (!epnew) {
|
||||
brelse(old_bh);
|
||||
return -EIO;
|
||||
@ -1209,12 +1202,11 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
|
||||
struct exfat_uni_name *p_uniname, struct exfat_inode_info *ei)
|
||||
{
|
||||
int ret, newentry, num_new_entries, num_old_entries;
|
||||
sector_t sector_mov, sector_new;
|
||||
struct exfat_dentry *epmov, *epnew;
|
||||
struct super_block *sb = inode->i_sb;
|
||||
struct buffer_head *mov_bh, *new_bh;
|
||||
|
||||
epmov = exfat_get_dentry(sb, p_olddir, oldentry, &mov_bh, §or_mov);
|
||||
epmov = exfat_get_dentry(sb, p_olddir, oldentry, &mov_bh);
|
||||
if (!epmov)
|
||||
return -EIO;
|
||||
|
||||
@ -1232,7 +1224,7 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
|
||||
if (newentry < 0)
|
||||
return newentry; /* -EIO or -ENOSPC */
|
||||
|
||||
epnew = exfat_get_dentry(sb, p_newdir, newentry, &new_bh, §or_new);
|
||||
epnew = exfat_get_dentry(sb, p_newdir, newentry, &new_bh);
|
||||
if (!epnew)
|
||||
return -EIO;
|
||||
|
||||
@ -1245,12 +1237,10 @@ static int exfat_move_file(struct inode *inode, struct exfat_chain *p_olddir,
|
||||
brelse(mov_bh);
|
||||
brelse(new_bh);
|
||||
|
||||
epmov = exfat_get_dentry(sb, p_olddir, oldentry + 1, &mov_bh,
|
||||
§or_mov);
|
||||
epmov = exfat_get_dentry(sb, p_olddir, oldentry + 1, &mov_bh);
|
||||
if (!epmov)
|
||||
return -EIO;
|
||||
epnew = exfat_get_dentry(sb, p_newdir, newentry + 1, &new_bh,
|
||||
§or_new);
|
||||
epnew = exfat_get_dentry(sb, p_newdir, newentry + 1, &new_bh);
|
||||
if (!epnew) {
|
||||
brelse(mov_bh);
|
||||
return -EIO;
|
||||
@ -1332,7 +1322,7 @@ static int __exfat_rename(struct inode *old_parent_inode,
|
||||
exfat_chain_dup(&olddir, &ei->dir);
|
||||
dentry = ei->entry;
|
||||
|
||||
ep = exfat_get_dentry(sb, &olddir, dentry, &old_bh, NULL);
|
||||
ep = exfat_get_dentry(sb, &olddir, dentry, &old_bh);
|
||||
if (!ep) {
|
||||
ret = -EIO;
|
||||
goto out;
|
||||
@ -1353,7 +1343,7 @@ static int __exfat_rename(struct inode *old_parent_inode,
|
||||
|
||||
p_dir = &(new_ei->dir);
|
||||
new_entry = new_ei->entry;
|
||||
ep = exfat_get_dentry(sb, p_dir, new_entry, &new_bh, NULL);
|
||||
ep = exfat_get_dentry(sb, p_dir, new_entry, &new_bh);
|
||||
if (!ep)
|
||||
goto out;
|
||||
|
||||
@ -1393,7 +1383,7 @@ static int __exfat_rename(struct inode *old_parent_inode,
|
||||
|
||||
if (!ret && new_inode) {
|
||||
/* delete entries of new_dir */
|
||||
ep = exfat_get_dentry(sb, p_dir, new_entry, &new_bh, NULL);
|
||||
ep = exfat_get_dentry(sb, p_dir, new_entry, &new_bh);
|
||||
if (!ep) {
|
||||
ret = -EIO;
|
||||
goto del_out;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user