X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_vfs_multi.c;h=a08e0716124291602ea99316f51c78bea2a19adc;hp=3044db72998fa052a08b99be8eb2509c37610ba2;hb=5758b7a95a391ac8e4d631fbea9fd409d1130a62;hpb=5af18695480b470eea2a2447a1c5211073b9c59b

diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c
index 3044db7..a08e071 100644
--- a/yaffs_vfs_multi.c
+++ b/yaffs_vfs_multi.c
@@ -1832,10 +1832,8 @@ static int yaffs_iterate(struct file *f, struct dir_context *dc)
 		goto out;
 	}
 
-	if (!dir_emit_dots(f, dc)) {
-		yaffs_gross_unlock(dev);
-		return 0;
-	}
+	if (!dir_emit_dots(f, dc))
+		goto out;
 
 	curoffs = 1;
 
@@ -2049,11 +2047,11 @@ static void yaffs_fill_inode_from_obj(struct inode *inode,
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
 
 		inode->i_rdev = old_decode_dev(obj->yst_rdev);
-		inode->i_atime.tv_sec = (time_t) (obj->yst_atime);
+		inode->i_atime.tv_sec = (YTIME_T) (obj->yst_atime);
 		inode->i_atime.tv_nsec = 0;
-		inode->i_mtime.tv_sec = (time_t) obj->yst_mtime;
+		inode->i_mtime.tv_sec = (YTIME_T) obj->yst_mtime;
 		inode->i_mtime.tv_nsec = 0;
-		inode->i_ctime.tv_sec = (time_t) obj->yst_ctime;
+		inode->i_ctime.tv_sec = (YTIME_T) obj->yst_ctime;
 		inode->i_ctime.tv_nsec = 0;
 #else
 		inode->i_rdev = obj->yst_rdev;