aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ufs/dir.c7
-rw-r--r--fs/ufs/ialloc.c1
-rw-r--r--fs/ufs/inode.c4
-rw-r--r--include/linux/ufs_fs_i.h1
4 files changed, 8 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,
252 unsigned long start, n; 252 unsigned long start, n;
253 unsigned long npages = ufs_dir_pages(dir); 253 unsigned long npages = ufs_dir_pages(dir);
254 struct page *page = NULL; 254 struct page *page = NULL;
255 struct ufs_inode_info *ui = UFS_I(dir);
255 struct ufs_dir_entry *de; 256 struct ufs_dir_entry *de;
256 257
257 UFSD("ENTER, dir_ino %lu, name %s, namlen %u\n", dir->i_ino, name, namelen); 258 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,
262 /* OFFSET_CACHE */ 263 /* OFFSET_CACHE */
263 *res_page = NULL; 264 *res_page = NULL;
264 265
265 /* start = ei->i_dir_start_lookup; */ 266 start = ui->i_dir_start_lookup;
266 start = 0; 267
267 if (start >= npages) 268 if (start >= npages)
268 start = 0; 269 start = 0;
269 n = start; 270 n = start;
@@ -295,7 +296,7 @@ out:
295 296
296found: 297found:
297 *res_page = page; 298 *res_page = page;
298 /* ei->i_dir_start_lookup = n; */ 299 ui->i_dir_start_lookup = n;
299 return de; 300 return de;
300} 301}
301 302
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:
264 ufsi->i_shadow = 0; 264 ufsi->i_shadow = 0;
265 ufsi->i_osync = 0; 265 ufsi->i_osync = 0;
266 ufsi->i_oeftflag = 0; 266 ufsi->i_oeftflag = 0;
267 ufsi->i_dir_start_lookup = 0;
267 memset(&ufsi->i_u1, 0, sizeof(ufsi->i_u1)); 268 memset(&ufsi->i_u1, 0, sizeof(ufsi->i_u1));
268 269
269 insert_inode_hash(inode); 270 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)
628 ufsi->i_shadow = fs32_to_cpu(sb, ufs_inode->ui_u3.ui_sun.ui_shadow); 628 ufsi->i_shadow = fs32_to_cpu(sb, ufs_inode->ui_u3.ui_sun.ui_shadow);
629 ufsi->i_oeftflag = fs32_to_cpu(sb, ufs_inode->ui_u3.ui_sun.ui_oeftflag); 629 ufsi->i_oeftflag = fs32_to_cpu(sb, ufs_inode->ui_u3.ui_sun.ui_oeftflag);
630 ufsi->i_lastfrag = (inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift; 630 ufsi->i_lastfrag = (inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift;
631 ufsi->i_dir_start_lookup = 0;
631 632
632 if (S_ISCHR(mode) || S_ISBLK(mode) || inode->i_blocks) { 633 if (S_ISCHR(mode) || S_ISBLK(mode) || inode->i_blocks) {
633 for (i = 0; i < (UFS_NDADDR + UFS_NINDIR); i++) 634 for (i = 0; i < (UFS_NDADDR + UFS_NINDIR); i++)
634 ufsi->i_u1.i_data[i] = ufs_inode->ui_u2.ui_addr.ui_db[i]; 635 ufsi->i_u1.i_data[i] = ufs_inode->ui_u2.ui_addr.ui_db[i];
635 } 636 } else {
636 else {
637 for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4; i++) 637 for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4; i++)
638 ufsi->i_u1.i_symlink[i] = ufs_inode->ui_u2.ui_symlink[i]; 638 ufsi->i_u1.i_symlink[i] = ufs_inode->ui_u2.ui_symlink[i];
639 } 639 }
diff --git a/include/linux/ufs_fs_i.h b/include/linux/ufs_fs_i.h
index 21665a953978..f50ce3b0cd52 100644
--- a/include/linux/ufs_fs_i.h
+++ b/include/linux/ufs_fs_i.h
@@ -27,6 +27,7 @@ struct ufs_inode_info {
27 __u32 i_oeftflag; 27 __u32 i_oeftflag;
28 __u16 i_osync; 28 __u16 i_osync;
29 __u32 i_lastfrag; 29 __u32 i_lastfrag;
30 __u32 i_dir_start_lookup;
30 struct inode vfs_inode; 31 struct inode vfs_inode;
31}; 32};
32 33