diff options
author | Evgeniy Dushistov <dushistov@mail.ru> | 2006-06-25 05:47:25 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 10:01:03 -0700 |
commit | dd187a2603d9904ddc410441348f0cfc558a5233 (patch) | |
tree | a3859f88d1f458a18d31a231f03c955393282255 /fs | |
parent | abf5d15fd2e52517dd56a17a846d5a1f900b7db4 (diff) |
[PATCH] ufs: little directory lookup optimization
This patch make little optimization of ufs_find_entry like "ext2" does. Save
number of page and reuse it again in the next call.
Signed-off-by: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ufs/dir.c | 7 | ||||
-rw-r--r-- | fs/ufs/ialloc.c | 1 | ||||
-rw-r--r-- | fs/ufs/inode.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index 732c3fd2b6f2..7f0a0aa63584 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c @@ -252,6 +252,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct dentry *dentry, unsigned long start, n; unsigned long npages = ufs_dir_pages(dir); struct page *page = NULL; + struct ufs_inode_info *ui = UFS_I(dir); struct ufs_dir_entry *de; UFSD("ENTER, dir_ino %lu, name %s, namlen %u\n", dir->i_ino, name, namelen); @@ -262,8 +263,8 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct dentry *dentry, /* OFFSET_CACHE */ *res_page = NULL; - /* start = ei->i_dir_start_lookup; */ - start = 0; + start = ui->i_dir_start_lookup; + if (start >= npages) start = 0; n = start; @@ -295,7 +296,7 @@ out: found: *res_page = page; - /* ei->i_dir_start_lookup = n; */ + ui->i_dir_start_lookup = n; return de; } diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index ad017fa2dd21..c684aaad9998 100644 --- a/fs/ufs/ialloc.c +++ b/fs/ufs/ialloc.c @@ -264,6 +264,7 @@ cg_found: ufsi->i_shadow = 0; ufsi->i_osync = 0; ufsi->i_oeftflag = 0; + ufsi->i_dir_start_lookup = 0; memset(&ufsi->i_u1, 0, sizeof(ufsi->i_u1)); insert_inode_hash(inode); diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index 01f754462341..c57612d443d0 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -628,12 +628,12 @@ void ufs_read_inode (struct inode * inode) ufsi->i_shadow = fs32_to_cpu(sb, ufs_inode->ui_u3.ui_sun.ui_shadow); ufsi->i_oeftflag = fs32_to_cpu(sb, ufs_inode->ui_u3.ui_sun.ui_oeftflag); ufsi->i_lastfrag = (inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift; + ufsi->i_dir_start_lookup = 0; if (S_ISCHR(mode) || S_ISBLK(mode) || inode->i_blocks) { for (i = 0; i < (UFS_NDADDR + UFS_NINDIR); i++) ufsi->i_u1.i_data[i] = ufs_inode->ui_u2.ui_addr.ui_db[i]; - } - else { + } else { for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4; i++) ufsi->i_u1.i_symlink[i] = ufs_inode->ui_u2.ui_symlink[i]; } |