iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NTFS: In fs/ntfs/dir.c, use i_size_read() once and then the cached value

Browse Source 
afterwards.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
This commit is contained in:
Anton Altaparmakov 2004-11-18 15:01:06 +00:00
parent 367636772f
commit 206f9f35b2
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ntfs/ChangeLog
View File

@ -41,6 +41,8 @@ ToDo/Notes:
- Use i_size_read() in fs/ntfs/compress.c at the start of the read and - Use i_size_read() in fs/ntfs/compress.c at the start of the read and
use the cached value afterwards. Cache the initialized_size in the use the cached value afterwards. Cache the initialized_size in the
same way and protect access to the two sizes using the size_lock. same way and protect access to the two sizes using the size_lock.
- Use i_size_read() in fs/ntfs/dir.c once and then use the cached
value afterwards.
2.1.22 - Many bug and race fixes and error handling improvements. 2.1.22 - Many bug and race fixes and error handling improvements.

13
fs/ntfs/dir.c
View File

@ -1101,7 +1101,7 @@ static inline int ntfs_filldir(ntfs_volume *vol, loff_t fpos,
static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir) static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
{ {
s64 ia_pos, ia_start, prev_ia_pos, bmp_pos; s64 ia_pos, ia_start, prev_ia_pos, bmp_pos;
loff_t fpos; loff_t fpos, i_size;
struct inode *bmp_vi, *vdir = filp->f_dentry->d_inode; struct inode *bmp_vi, *vdir = filp->f_dentry->d_inode;
struct super_block *sb = vdir->i_sb; struct super_block *sb = vdir->i_sb;
ntfs_inode *ndir = NTFS_I(vdir); ntfs_inode *ndir = NTFS_I(vdir);
@ -1122,7 +1122,8 @@ static int ntfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
vdir->i_ino, fpos); vdir->i_ino, fpos);
rc = err = 0; rc = err = 0;
/* Are we at end of dir yet? */ /* Are we at end of dir yet? */
if (fpos >= vdir->i_size + vol->mft_record_size) i_size = i_size_read(vdir);
if (fpos >= i_size + vol->mft_record_size)
goto done; goto done;
/* Emulate . and .. for all directories. */ /* Emulate . and .. for all directories. */
if (!fpos) { if (!fpos) {
@ -1264,7 +1265,7 @@ skip_index_root:
bmp_mapping = bmp_vi->i_mapping; bmp_mapping = bmp_vi->i_mapping;
/* Get the starting bitmap bit position and sanity check it. */ /* Get the starting bitmap bit position and sanity check it. */
bmp_pos = ia_pos >> ndir->itype.index.block_size_bits; bmp_pos = ia_pos >> ndir->itype.index.block_size_bits;
if (unlikely(bmp_pos >> 3 >= bmp_vi->i_size)) { if (unlikely(bmp_pos >> 3 >= i_size_read(bmp_vi))) {
ntfs_error(sb, "Current index allocation position exceeds " ntfs_error(sb, "Current index allocation position exceeds "
"index bitmap size."); "index bitmap size.");
goto err_out; goto err_out;
@ -1301,7 +1302,7 @@ find_next_index_buffer:
goto get_next_bmp_page; goto get_next_bmp_page;
} }
/* If we have reached the end of the bitmap, we are done. */ /* If we have reached the end of the bitmap, we are done. */
if (unlikely(((bmp_pos + cur_bmp_pos) >> 3) >= vdir->i_size)) if (unlikely(((bmp_pos + cur_bmp_pos) >> 3) >= i_size))
goto unm_EOD; goto unm_EOD;
ia_pos = (bmp_pos + cur_bmp_pos) << ia_pos = (bmp_pos + cur_bmp_pos) <<
ndir->itype.index.block_size_bits; ndir->itype.index.block_size_bits;
@ -1441,7 +1442,7 @@ unm_EOD:
ntfs_unmap_page(bmp_page); ntfs_unmap_page(bmp_page);
EOD: EOD:
/* We are finished, set fpos to EOD. */ /* We are finished, set fpos to EOD. */
fpos = vdir->i_size + vol->mft_record_size; fpos = i_size + vol->mft_record_size;
abort: abort:
kfree(name); kfree(name);
done: done:
@ -1495,7 +1496,7 @@ err_out:
static int ntfs_dir_open(struct inode *vi, struct file *filp) static int ntfs_dir_open(struct inode *vi, struct file *filp)
{ {
if (sizeof(unsigned long) < 8) { if (sizeof(unsigned long) < 8) {
if (vi->i_size > MAX_LFS_FILESIZE) if (i_size_read(vi) > MAX_LFS_FILESIZE)
return -EFBIG; return -EFBIG;
} }
return 0; return 0;