4 files changed, 28 insertions, 32 deletions

diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index 0315fea1d589..f80be4c5df9d 100644
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -455,24 +455,14 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
         /*
          * allocate new block and move data
          */
-        switch (fs32_to_cpu(sb, usb1->fs_optim)) {
-            case UFS_OPTSPACE:
+        if (fs32_to_cpu(sb, usb1->fs_optim) == UFS_OPTSPACE) {
                 request = newcount;
-                if (uspi->s_minfree < 5 || uspi->cs_total.cs_nffree
-                    > uspi->s_dsize * uspi->s_minfree / (2 * 100))
-                        break;
-                usb1->fs_optim = cpu_to_fs32(sb, UFS_OPTTIME);
-                break;
-            default:
-                usb1->fs_optim = cpu_to_fs32(sb, UFS_OPTTIME);
-        
-            case UFS_OPTTIME:
+                if (uspi->cs_total.cs_nffree < uspi->s_space_to_time)
+                        usb1->fs_optim = cpu_to_fs32(sb, UFS_OPTTIME);
+        } else {
                 request = uspi->s_fpb;
-                if (uspi->cs_total.cs_nffree < uspi->s_dsize *
-                    (uspi->s_minfree - 2) / 100)
-                        break;
-                usb1->fs_optim = cpu_to_fs32(sb, UFS_OPTTIME);
-                break;
+                if (uspi->cs_total.cs_nffree > uspi->s_time_to_space)
+                        usb1->fs_optim = cpu_to_fs32(sb, UFS_OPTSPACE);
         }
         result = ufs_alloc_fragments (inode, cgno, goal, request, err);
         if (result) {
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 9f4590261134..f36d6a53687d 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -566,10 +566,8 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode)
          */
         inode->i_mode = mode = fs16_to_cpu(sb, ufs_inode->ui_mode);
         set_nlink(inode, fs16_to_cpu(sb, ufs_inode->ui_nlink));
-        if (inode->i_nlink == 0) {
-                ufs_error (sb, "ufs_read_inode", "inode %lu has zero nlink\n", inode->i_ino);
-                return -1;
-        }
+        if (inode->i_nlink == 0)
+                return -ESTALE;
 
         /*
          * Linux now has 32-bit uid and gid, so we can support EFT.
@@ -578,9 +576,9 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode)
         i_gid_write(inode, ufs_get_inode_gid(sb, ufs_inode));
 
         inode->i_size = fs64_to_cpu(sb, ufs_inode->ui_size);
-        inode->i_atime.tv_sec = fs32_to_cpu(sb, ufs_inode->ui_atime.tv_sec);
-        inode->i_ctime.tv_sec = fs32_to_cpu(sb, ufs_inode->ui_ctime.tv_sec);
-        inode->i_mtime.tv_sec = fs32_to_cpu(sb, ufs_inode->ui_mtime.tv_sec);
+        inode->i_atime.tv_sec = (signed)fs32_to_cpu(sb, ufs_inode->ui_atime.tv_sec);
+        inode->i_ctime.tv_sec = (signed)fs32_to_cpu(sb, ufs_inode->ui_ctime.tv_sec);
+        inode->i_mtime.tv_sec = (signed)fs32_to_cpu(sb, ufs_inode->ui_mtime.tv_sec);
         inode->i_mtime.tv_nsec = 0;
         inode->i_atime.tv_nsec = 0;
         inode->i_ctime.tv_nsec = 0;
@@ -614,10 +612,8 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode)
          */
         inode->i_mode = mode = fs16_to_cpu(sb, ufs2_inode->ui_mode);
         set_nlink(inode, fs16_to_cpu(sb, ufs2_inode->ui_nlink));
-        if (inode->i_nlink == 0) {
-                ufs_error (sb, "ufs_read_inode", "inode %lu has zero nlink\n", inode->i_ino);
-                return -1;
-        }
+        if (inode->i_nlink == 0)
+                return -ESTALE;
 
         /*
          * Linux now has 32-bit uid and gid, so we can support EFT.
@@ -657,7 +653,7 @@ struct inode *ufs_iget(struct super_block *sb, unsigned long ino)
         struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
         struct buffer_head * bh;
         struct inode *inode;
-        int err;
+        int err = -EIO;
 
         UFSD("ENTER, ino %lu\n", ino);
 
@@ -692,9 +688,10 @@ struct inode *ufs_iget(struct super_block *sb, unsigned long ino)
                 err = ufs1_read_inode(inode,
                                       ufs_inode + ufs_inotofsbo(inode->i_ino));
         }
-
+        brelse(bh);
         if (err)
                 goto bad_inode;
+
         inode->i_version++;
         ufsi->i_lastfrag =
                 (inode->i_size + uspi->s_fsize - 1) >> uspi->s_fshift;
@@ -703,15 +700,13 @@ struct inode *ufs_iget(struct super_block *sb, unsigned long ino)
 
         ufs_set_inode_ops(inode);
 
-        brelse(bh);
-
         UFSD("EXIT\n");
         unlock_new_inode(inode);
         return inode;
 
 bad_inode:
         iget_failed(inode);
-        return ERR_PTR(-EIO);
+        return ERR_PTR(err);
 }
 
 static void ufs1_update_inode(struct inode *inode, struct ufs_inode *ufs_inode)
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index d5300adbfd79..0a4f58a5073c 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -1210,6 +1210,15 @@ magic_found:
 
         uspi->s_root_blocks = mul_u64_u32_div(uspi->s_dsize,
                                               uspi->s_minfree, 100);
+        if (uspi->s_minfree <= 5) {
+                uspi->s_time_to_space = ~0ULL;
+                uspi->s_space_to_time = 0;
+                usb1->fs_optim = cpu_to_fs32(sb, UFS_OPTSPACE);
+        } else {
+                uspi->s_time_to_space = (uspi->s_root_blocks / 2) + 1;
+                uspi->s_space_to_time = mul_u64_u32_div(uspi->s_dsize,
+                                              uspi->s_minfree - 2, 100) - 1;
+        }
 
         /*
          * Compute another frequently used values
diff --git a/fs/ufs/ufs_fs.h b/fs/ufs/ufs_fs.h
index 823d55a37586..150eef6f1233 100644
--- a/fs/ufs/ufs_fs.h
+++ b/fs/ufs/ufs_fs.h
@@ -792,6 +792,8 @@ struct ufs_sb_private_info {
         __s32   fs_magic;       /* filesystem magic */
         unsigned int s_dirblksize;
         __u64   s_root_blocks;
+        __u64   s_time_to_space;
+        __u64   s_space_to_time;
 };
 
 /*