Patched in Tegra support.

1 files changed, 12 insertions, 12 deletions

diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index d0426d74817..2eabf04af3d 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -71,11 +71,11 @@ void ufs_free_inode (struct inode * inode)
         
         ino = inode->i_ino;
 
-        mutex_lock(&UFS_SB(sb)->s_lock);
+        lock_super (sb);
 
         if (!((ino > 1) && (ino < (uspi->s_ncg * uspi->s_ipg )))) {
                 ufs_warning(sb, "ufs_free_inode", "reserved inode or nonexistent inode %u\n", ino);
-                mutex_unlock(&UFS_SB(sb)->s_lock);
+                unlock_super (sb);
                 return;
         }
         
@@ -83,7 +83,7 @@ void ufs_free_inode (struct inode * inode)
         bit = ufs_inotocgoff (ino);
         ucpi = ufs_load_cylinder (sb, cg);
         if (!ucpi) {
-                mutex_unlock(&UFS_SB(sb)->s_lock);
+                unlock_super (sb);
                 return;
         }
         ucg = ubh_get_ucg(UCPI_UBH(ucpi));
@@ -116,8 +116,8 @@ void ufs_free_inode (struct inode * inode)
         if (sb->s_flags & MS_SYNCHRONOUS)
                 ubh_sync_block(UCPI_UBH(ucpi));
         
-        ufs_mark_sb_dirty(sb);
-        mutex_unlock(&UFS_SB(sb)->s_lock);
+        sb->s_dirt = 1;
+        unlock_super (sb);
         UFSD("EXIT\n");
 }
 
@@ -170,7 +170,7 @@ static void ufs2_init_inodes_chunk(struct super_block *sb,
  * For other inodes, search forward from the parent directory's block
  * group to find a free inode.
  */
-struct inode *ufs_new_inode(struct inode *dir, umode_t mode)
+struct inode * ufs_new_inode(struct inode * dir, int mode)
 {
         struct super_block * sb;
         struct ufs_sb_info * sbi;
@@ -197,7 +197,7 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode)
         uspi = sbi->s_uspi;
         usb1 = ubh_get_usb_first(uspi);
 
-        mutex_lock(&sbi->s_lock);
+        lock_super (sb);
 
         /*
          * Try to place the inode in its parent directory
@@ -288,7 +288,7 @@ cg_found:
         ubh_mark_buffer_dirty (UCPI_UBH(ucpi));
         if (sb->s_flags & MS_SYNCHRONOUS)
                 ubh_sync_block(UCPI_UBH(ucpi));
-        ufs_mark_sb_dirty(sb);
+        sb->s_dirt = 1;
 
         inode->i_ino = cg * uspi->s_ipg + bit;
         inode_init_owner(inode, dir, mode);
@@ -333,20 +333,20 @@ cg_found:
                 brelse(bh);
         }
 
-        mutex_unlock(&sbi->s_lock);
+        unlock_super (sb);
 
         UFSD("allocating inode %lu\n", inode->i_ino);
         UFSD("EXIT\n");
         return inode;
 
 fail_remove_inode:
-        mutex_unlock(&sbi->s_lock);
-        clear_nlink(inode);
+        unlock_super(sb);
+        inode->i_nlink = 0;
         iput(inode);
         UFSD("EXIT (FAILED): err %d\n", err);
         return ERR_PTR(err);
 failed:
-        mutex_unlock(&sbi->s_lock);
+        unlock_super (sb);
         make_bad_inode(inode);
         iput (inode);
         UFSD("EXIT (FAILED): err %d\n", err);