Patched in Tegra support.

7 files changed, 158 insertions, 176 deletions

diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index a7ea492ae66..42694e11c23 100644
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -54,7 +54,7 @@ void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count)
         if (ufs_fragnum(fragment) + count > uspi->s_fpg)
                 ufs_error (sb, "ufs_free_fragments", "internal error");
         
-        mutex_lock(&UFS_SB(sb)->s_lock);
+        lock_super(sb);
         
         cgno = ufs_dtog(uspi, fragment);
         bit = ufs_dtogd(uspi, fragment);
@@ -116,14 +116,14 @@ void ufs_free_fragments(struct inode *inode, u64 fragment, unsigned count)
         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;
         
-        mutex_unlock(&UFS_SB(sb)->s_lock);
+        unlock_super (sb);
         UFSD("EXIT\n");
         return;
 
 failed:
-        mutex_unlock(&UFS_SB(sb)->s_lock);
+        unlock_super (sb);
         UFSD("EXIT (FAILED)\n");
         return;
 }
@@ -155,7 +155,7 @@ void ufs_free_blocks(struct inode *inode, u64 fragment, unsigned count)
                 goto failed;
         }
 
-        mutex_lock(&UFS_SB(sb)->s_lock);
+        lock_super(sb);
         
 do_more:
         overflow = 0;
@@ -214,13 +214,13 @@ do_more:
                 goto do_more;
         }
 
-        ufs_mark_sb_dirty(sb);
-        mutex_unlock(&UFS_SB(sb)->s_lock);
+        sb->s_dirt = 1;
+        unlock_super (sb);
         UFSD("EXIT\n");
         return;
 
 failed_unlock:
-        mutex_unlock(&UFS_SB(sb)->s_lock);
+        unlock_super (sb);
 failed:
         UFSD("EXIT (FAILED)\n");
         return;
@@ -361,7 +361,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
         usb1 = ubh_get_usb_first(uspi);
         *err = -ENOSPC;
 
-        mutex_lock(&UFS_SB(sb)->s_lock);
+        lock_super (sb);
         tmp = ufs_data_ptr_to_cpu(sb, p);
 
         if (count + ufs_fragnum(fragment) > uspi->s_fpb) {
@@ -382,19 +382,19 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
                                   "fragment %llu, tmp %llu\n",
                                   (unsigned long long)fragment,
                                   (unsigned long long)tmp);
-                        mutex_unlock(&UFS_SB(sb)->s_lock);
+                        unlock_super(sb);
                         return INVBLOCK;
                 }
                 if (fragment < UFS_I(inode)->i_lastfrag) {
                         UFSD("EXIT (ALREADY ALLOCATED)\n");
-                        mutex_unlock(&UFS_SB(sb)->s_lock);
+                        unlock_super (sb);
                         return 0;
                 }
         }
         else {
                 if (tmp) {
                         UFSD("EXIT (ALREADY ALLOCATED)\n");
-                        mutex_unlock(&UFS_SB(sb)->s_lock);
+                        unlock_super(sb);
                         return 0;
                 }
         }
@@ -403,7 +403,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
          * There is not enough space for user on the device
          */
         if (!capable(CAP_SYS_RESOURCE) && ufs_freespace(uspi, UFS_MINFREE) <= 0) {
-                mutex_unlock(&UFS_SB(sb)->s_lock);
+                unlock_super (sb);
                 UFSD("EXIT (FAILED)\n");
                 return 0;
         }
@@ -428,7 +428,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
                         ufs_clear_frags(inode, result + oldcount,
                                         newcount - oldcount, locked_page != NULL);
                 }
-                mutex_unlock(&UFS_SB(sb)->s_lock);
+                unlock_super(sb);
                 UFSD("EXIT, result %llu\n", (unsigned long long)result);
                 return result;
         }
@@ -443,7 +443,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
                                                 fragment + count);
                 ufs_clear_frags(inode, result + oldcount, newcount - oldcount,
                                 locked_page != NULL);
-                mutex_unlock(&UFS_SB(sb)->s_lock);
+                unlock_super(sb);
                 UFSD("EXIT, result %llu\n", (unsigned long long)result);
                 return result;
         }
@@ -481,7 +481,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
                 *err = 0;
                 UFS_I(inode)->i_lastfrag = max(UFS_I(inode)->i_lastfrag,
                                                 fragment + count);
-                mutex_unlock(&UFS_SB(sb)->s_lock);
+                unlock_super(sb);
                 if (newcount < request)
                         ufs_free_fragments (inode, result + newcount, request - newcount);
                 ufs_free_fragments (inode, tmp, oldcount);
@@ -489,7 +489,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment,
                 return result;
         }
 
-        mutex_unlock(&UFS_SB(sb)->s_lock);
+        unlock_super(sb);
         UFSD("EXIT (FAILED)\n");
         return 0;
 }               
@@ -557,7 +557,7 @@ static u64 ufs_add_fragments(struct inode *inode, u64 fragment,
         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;
 
         UFSD("EXIT, fragment %llu\n", (unsigned long long)fragment);
         
@@ -677,7 +677,7 @@ succed:
         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;
 
         result += cgno * uspi->s_fpg;
         UFSD("EXIT3, result %llu\n", (unsigned long long)result);
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);
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index ff24e4449ec..b4d791a8320 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -26,6 +26,7 @@
  */
 
 #include <asm/uaccess.h>
+#include <asm/system.h>
 
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -526,14 +527,6 @@ int ufs_prepare_chunk(struct page *page, loff_t pos, unsigned len)
         return __block_write_begin(page, pos, len, ufs_getfrag_block);
 }
 
-static void ufs_write_failed(struct address_space *mapping, loff_t to)
-{
-        struct inode *inode = mapping->host;
-
-        if (to > inode->i_size)
-                truncate_pagecache(inode, to, inode->i_size);
-}
-
 static int ufs_write_begin(struct file *file, struct address_space *mapping,
                         loff_t pos, unsigned len, unsigned flags,
                         struct page **pagep, void **fsdata)
@@ -542,8 +535,11 @@ static int ufs_write_begin(struct file *file, struct address_space *mapping,
 
         ret = block_write_begin(mapping, pos, len, flags, pagep,
                                 ufs_getfrag_block);
-        if (unlikely(ret))
-                ufs_write_failed(mapping, pos + len);
+        if (unlikely(ret)) {
+                loff_t isize = mapping->host->i_size;
+                if (pos + len > isize)
+                        vmtruncate(mapping->host, isize);
+        }
 
         return ret;
 }
@@ -587,13 +583,13 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode)
 {
         struct ufs_inode_info *ufsi = UFS_I(inode);
         struct super_block *sb = inode->i_sb;
-        umode_t mode;
+        mode_t mode;
 
         /*
          * Copy data to the in-core inode.
          */
         inode->i_mode = mode = fs16_to_cpu(sb, ufs_inode->ui_mode);
-        set_nlink(inode, fs16_to_cpu(sb, ufs_inode->ui_nlink));
+        inode->i_nlink = 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;
@@ -602,8 +598,8 @@ static int ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode)
         /*
          * Linux now has 32-bit uid and gid, so we can support EFT.
          */
-        i_uid_write(inode, ufs_get_inode_uid(sb, ufs_inode));
-        i_gid_write(inode, ufs_get_inode_gid(sb, ufs_inode));
+        inode->i_uid = ufs_get_inode_uid(sb, ufs_inode);
+        inode->i_gid = 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);
@@ -634,14 +630,14 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode)
 {
         struct ufs_inode_info *ufsi = UFS_I(inode);
         struct super_block *sb = inode->i_sb;
-        umode_t mode;
+        mode_t mode;
 
         UFSD("Reading ufs2 inode, ino %lu\n", inode->i_ino);
         /*
          * Copy data to the in-core inode.
          */
         inode->i_mode = mode = fs16_to_cpu(sb, ufs2_inode->ui_mode);
-        set_nlink(inode, fs16_to_cpu(sb, ufs2_inode->ui_nlink));
+        inode->i_nlink = 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;
@@ -650,8 +646,8 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode)
         /*
          * Linux now has 32-bit uid and gid, so we can support EFT.
          */
-        i_uid_write(inode, fs32_to_cpu(sb, ufs2_inode->ui_uid));
-        i_gid_write(inode, fs32_to_cpu(sb, ufs2_inode->ui_gid));
+        inode->i_uid = fs32_to_cpu(sb, ufs2_inode->ui_uid);
+        inode->i_gid = fs32_to_cpu(sb, ufs2_inode->ui_gid);
 
         inode->i_size = fs64_to_cpu(sb, ufs2_inode->ui_size);
         inode->i_atime.tv_sec = fs64_to_cpu(sb, ufs2_inode->ui_atime);
@@ -750,8 +746,8 @@ static void ufs1_update_inode(struct inode *inode, struct ufs_inode *ufs_inode)
         ufs_inode->ui_mode = cpu_to_fs16(sb, inode->i_mode);
         ufs_inode->ui_nlink = cpu_to_fs16(sb, inode->i_nlink);
 
-        ufs_set_inode_uid(sb, ufs_inode, i_uid_read(inode));
-        ufs_set_inode_gid(sb, ufs_inode, i_gid_read(inode));
+        ufs_set_inode_uid(sb, ufs_inode, inode->i_uid);
+        ufs_set_inode_gid(sb, ufs_inode, inode->i_gid);
                 
         ufs_inode->ui_size = cpu_to_fs64(sb, inode->i_size);
         ufs_inode->ui_atime.tv_sec = cpu_to_fs32(sb, inode->i_atime.tv_sec);
@@ -794,8 +790,8 @@ static void ufs2_update_inode(struct inode *inode, struct ufs2_inode *ufs_inode)
         ufs_inode->ui_mode = cpu_to_fs16(sb, inode->i_mode);
         ufs_inode->ui_nlink = cpu_to_fs16(sb, inode->i_nlink);
 
-        ufs_inode->ui_uid = cpu_to_fs32(sb, i_uid_read(inode));
-        ufs_inode->ui_gid = cpu_to_fs32(sb, i_gid_read(inode));
+        ufs_inode->ui_uid = cpu_to_fs32(sb, inode->i_uid);
+        ufs_inode->ui_gid = cpu_to_fs32(sb, inode->i_gid);
 
         ufs_inode->ui_size = cpu_to_fs64(sb, inode->i_size);
         ufs_inode->ui_atime = cpu_to_fs64(sb, inode->i_atime.tv_sec);
@@ -900,7 +896,7 @@ void ufs_evict_inode(struct inode * inode)
         }
 
         invalidate_inode_buffers(inode);
-        clear_inode(inode);
+        end_writeback(inode);
 
         if (want_delete) {
                 lock_ufs(inode->i_sb);
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 90d74b8f8eb..639d4916224 100644
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -46,7 +46,7 @@ static inline int ufs_add_nondir(struct dentry *dentry, struct inode *inode)
         return err;
 }
 
-static struct dentry *ufs_lookup(struct inode * dir, struct dentry *dentry, unsigned int flags)
+static struct dentry *ufs_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
 {
         struct inode * inode = NULL;
         ino_t ino;
@@ -70,8 +70,8 @@ static struct dentry *ufs_lookup(struct inode * dir, struct dentry *dentry, unsi
  * If the create succeeds, we fill in the inode information
  * with d_instantiate(). 
  */
-static int ufs_create (struct inode * dir, struct dentry * dentry, umode_t mode,
-                bool excl)
+static int ufs_create (struct inode * dir, struct dentry * dentry, int mode,
+                struct nameidata *nd)
 {
         struct inode *inode;
         int err;
@@ -94,7 +94,7 @@ static int ufs_create (struct inode * dir, struct dentry * dentry, umode_t mode,
         return err;
 }
 
-static int ufs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t rdev)
+static int ufs_mknod (struct inode * dir, struct dentry *dentry, int mode, dev_t rdev)
 {
         struct inode *inode;
         int err;
@@ -166,6 +166,10 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
         int error;
 
         lock_ufs(dir->i_sb);
+        if (inode->i_nlink >= UFS_LINK_MAX) {
+                unlock_ufs(dir->i_sb);
+                return -EMLINK;
+        }
 
         inode->i_ctime = CURRENT_TIME_SEC;
         inode_inc_link_count(inode);
@@ -176,10 +180,13 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
         return error;
 }
 
-static int ufs_mkdir(struct inode * dir, struct dentry * dentry, umode_t mode)
+static int ufs_mkdir(struct inode * dir, struct dentry * dentry, int mode)
 {
         struct inode * inode;
-        int err;
+        int err = -EMLINK;
+
+        if (dir->i_nlink >= UFS_LINK_MAX)
+                goto out;
 
         lock_ufs(dir->i_sb);
         inode_inc_link_count(dir);
@@ -298,6 +305,11 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
                         drop_nlink(new_inode);
                 inode_dec_link_count(new_inode);
         } else {
+                if (dir_de) {
+                        err = -EMLINK;
+                        if (new_dir->i_nlink >= UFS_LINK_MAX)
+                                goto out_dir;
+                }
                 err = ufs_add_link(new_dentry, old_inode);
                 if (err)
                         goto out_dir;
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index dc8e3a861d0..3915ade6f9a 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -73,6 +73,7 @@
 #include <stdarg.h>
 
 #include <asm/uaccess.h>
+#include <asm/system.h>
 
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -146,7 +147,10 @@ static struct dentry *ufs_fh_to_parent(struct super_block *sb, struct fid *fid,
 
 static struct dentry *ufs_get_parent(struct dentry *child)
 {
-        struct qstr dot_dot = QSTR_INIT("..", 2);
+        struct qstr dot_dot = {
+                .name   = "..",
+                .len    = 2,
+        };
         ino_t ino;
 
         ino = ufs_inode_by_name(child->d_inode, &dot_dot);
@@ -302,7 +306,7 @@ void ufs_error (struct super_block * sb, const char * function,
         if (!(sb->s_flags & MS_RDONLY)) {
                 usb1->fs_clean = UFS_FSBAD;
                 ubh_mark_buffer_dirty(USPI_UBH(uspi));
-                ufs_mark_sb_dirty(sb);
+                sb->s_dirt = 1;
                 sb->s_flags |= MS_RDONLY;
         }
         va_start (args, fmt);
@@ -334,7 +338,7 @@ void ufs_panic (struct super_block * sb, const char * function,
         if (!(sb->s_flags & MS_RDONLY)) {
                 usb1->fs_clean = UFS_FSBAD;
                 ubh_mark_buffer_dirty(USPI_UBH(uspi));
-                ufs_mark_sb_dirty(sb);
+                sb->s_dirt = 1;
         }
         va_start (args, fmt);
         vsnprintf (error_buf, sizeof(error_buf), fmt, args);
@@ -691,83 +695,6 @@ static void ufs_put_super_internal(struct super_block *sb)
         UFSD("EXIT\n");
 }
 
-static int ufs_sync_fs(struct super_block *sb, int wait)
-{
-        struct ufs_sb_private_info * uspi;
-        struct ufs_super_block_first * usb1;
-        struct ufs_super_block_third * usb3;
-        unsigned flags;
-
-        lock_ufs(sb);
-        mutex_lock(&UFS_SB(sb)->s_lock);
-
-        UFSD("ENTER\n");
-
-        flags = UFS_SB(sb)->s_flags;
-        uspi = UFS_SB(sb)->s_uspi;
-        usb1 = ubh_get_usb_first(uspi);
-        usb3 = ubh_get_usb_third(uspi);
-
-        usb1->fs_time = cpu_to_fs32(sb, get_seconds());
-        if ((flags & UFS_ST_MASK) == UFS_ST_SUN  ||
-            (flags & UFS_ST_MASK) == UFS_ST_SUNOS ||
-            (flags & UFS_ST_MASK) == UFS_ST_SUNx86)
-                ufs_set_fs_state(sb, usb1, usb3,
-                                UFS_FSOK - fs32_to_cpu(sb, usb1->fs_time));
-        ufs_put_cstotal(sb);
-
-        UFSD("EXIT\n");
-        mutex_unlock(&UFS_SB(sb)->s_lock);
-        unlock_ufs(sb);
-
-        return 0;
-}
-
-static void delayed_sync_fs(struct work_struct *work)
-{
-        struct ufs_sb_info *sbi;
-
-        sbi = container_of(work, struct ufs_sb_info, sync_work.work);
-
-        spin_lock(&sbi->work_lock);
-        sbi->work_queued = 0;
-        spin_unlock(&sbi->work_lock);
-
-        ufs_sync_fs(sbi->sb, 1);
-}
-
-void ufs_mark_sb_dirty(struct super_block *sb)
-{
-        struct ufs_sb_info *sbi = UFS_SB(sb);
-        unsigned long delay;
-
-        spin_lock(&sbi->work_lock);
-        if (!sbi->work_queued) {
-                delay = msecs_to_jiffies(dirty_writeback_interval * 10);
-                queue_delayed_work(system_long_wq, &sbi->sync_work, delay);
-                sbi->work_queued = 1;
-        }
-        spin_unlock(&sbi->work_lock);
-}
-
-static void ufs_put_super(struct super_block *sb)
-{
-        struct ufs_sb_info * sbi = UFS_SB(sb);
-
-        UFSD("ENTER\n");
-
-        if (!(sb->s_flags & MS_RDONLY))
-                ufs_put_super_internal(sb);
-        cancel_delayed_work_sync(&sbi->sync_work);
-
-        ubh_brelse_uspi (sbi->s_uspi);
-        kfree (sbi->s_uspi);
-        kfree (sbi);
-        sb->s_fs_info = NULL;
-        UFSD("EXIT\n");
-        return;
-}
-
 static int ufs_fill_super(struct super_block *sb, void *data, int silent)
 {
         struct ufs_sb_info * sbi;
@@ -793,7 +720,6 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
         if (!sbi)
                 goto failed_nomem;
         sb->s_fs_info = sbi;
-        sbi->sb = sb;
 
         UFSD("flag %u\n", (int)(sb->s_flags & MS_RDONLY));
         
@@ -805,9 +731,6 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
         }
 #endif
         mutex_init(&sbi->mutex);
-        mutex_init(&sbi->s_lock);
-        spin_lock_init(&sbi->work_lock);
-        INIT_DELAYED_WORK(&sbi->sync_work, delayed_sync_fs);
         /*
          * Set default mount options
          * Parse mount options
@@ -1234,17 +1157,16 @@ magic_found:
                             "fast symlink size (%u)\n", uspi->s_maxsymlinklen);
                 uspi->s_maxsymlinklen = maxsymlen;
         }
-        sb->s_max_links = UFS_LINK_MAX;
 
         inode = ufs_iget(sb, UFS_ROOTINO);
         if (IS_ERR(inode)) {
                 ret = PTR_ERR(inode);
                 goto failed;
         }
-        sb->s_root = d_make_root(inode);
+        sb->s_root = d_alloc_root(inode);
         if (!sb->s_root) {
                 ret = -ENOMEM;
-                goto failed;
+                goto dalloc_failed;
         }
 
         ufs_setup_cstotal(sb);
@@ -1258,6 +1180,8 @@ magic_found:
         UFSD("EXIT\n");
         return 0;
 
+dalloc_failed:
+        iput(inode);
 failed:
         if (ubh)
                 ubh_brelse_uspi (uspi);
@@ -1272,6 +1196,68 @@ failed_nomem:
         return -ENOMEM;
 }
 
+static int ufs_sync_fs(struct super_block *sb, int wait)
+{
+        struct ufs_sb_private_info * uspi;
+        struct ufs_super_block_first * usb1;
+        struct ufs_super_block_third * usb3;
+        unsigned flags;
+
+        lock_ufs(sb);
+        lock_super(sb);
+
+        UFSD("ENTER\n");
+
+        flags = UFS_SB(sb)->s_flags;
+        uspi = UFS_SB(sb)->s_uspi;
+        usb1 = ubh_get_usb_first(uspi);
+        usb3 = ubh_get_usb_third(uspi);
+
+        usb1->fs_time = cpu_to_fs32(sb, get_seconds());
+        if ((flags & UFS_ST_MASK) == UFS_ST_SUN  ||
+            (flags & UFS_ST_MASK) == UFS_ST_SUNOS ||
+            (flags & UFS_ST_MASK) == UFS_ST_SUNx86)
+                ufs_set_fs_state(sb, usb1, usb3,
+                                UFS_FSOK - fs32_to_cpu(sb, usb1->fs_time));
+        ufs_put_cstotal(sb);
+        sb->s_dirt = 0;
+
+        UFSD("EXIT\n");
+        unlock_super(sb);
+        unlock_ufs(sb);
+
+        return 0;
+}
+
+static void ufs_write_super(struct super_block *sb)
+{
+        if (!(sb->s_flags & MS_RDONLY))
+                ufs_sync_fs(sb, 1);
+        else
+                sb->s_dirt = 0;
+}
+
+static void ufs_put_super(struct super_block *sb)
+{
+        struct ufs_sb_info * sbi = UFS_SB(sb);
+                
+        UFSD("ENTER\n");
+
+        if (sb->s_dirt)
+                ufs_write_super(sb);
+
+        if (!(sb->s_flags & MS_RDONLY))
+                ufs_put_super_internal(sb);
+        
+        ubh_brelse_uspi (sbi->s_uspi);
+        kfree (sbi->s_uspi);
+        kfree (sbi);
+        sb->s_fs_info = NULL;
+        UFSD("EXIT\n");
+        return;
+}
+
+
 static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
 {
         struct ufs_sb_private_info * uspi;
@@ -1281,7 +1267,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
         unsigned flags;
 
         lock_ufs(sb);
-        mutex_lock(&UFS_SB(sb)->s_lock);
+        lock_super(sb);
         uspi = UFS_SB(sb)->s_uspi;
         flags = UFS_SB(sb)->s_flags;
         usb1 = ubh_get_usb_first(uspi);
@@ -1295,7 +1281,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
         new_mount_opt = 0;
         ufs_set_opt (new_mount_opt, ONERROR_LOCK);
         if (!ufs_parse_options (data, &new_mount_opt)) {
-                mutex_unlock(&UFS_SB(sb)->s_lock);
+                unlock_super(sb);
                 unlock_ufs(sb);
                 return -EINVAL;
         }
@@ -1303,14 +1289,14 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
                 new_mount_opt |= ufstype;
         } else if ((new_mount_opt & UFS_MOUNT_UFSTYPE) != ufstype) {
                 printk("ufstype can't be changed during remount\n");
-                mutex_unlock(&UFS_SB(sb)->s_lock);
+                unlock_super(sb);
                 unlock_ufs(sb);
                 return -EINVAL;
         }
 
         if ((*mount_flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) {
                 UFS_SB(sb)->s_mount_opt = new_mount_opt;
-                mutex_unlock(&UFS_SB(sb)->s_lock);
+                unlock_super(sb);
                 unlock_ufs(sb);
                 return 0;
         }
@@ -1327,6 +1313,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
                         ufs_set_fs_state(sb, usb1, usb3,
                                 UFS_FSOK - fs32_to_cpu(sb, usb1->fs_time));
                 ubh_mark_buffer_dirty (USPI_UBH(uspi));
+                sb->s_dirt = 0;
                 sb->s_flags |= MS_RDONLY;
         } else {
         /*
@@ -1335,7 +1322,7 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
 #ifndef CONFIG_UFS_FS_WRITE
                 printk("ufs was compiled with read-only support, "
                 "can't be mounted as read-write\n");
-                mutex_unlock(&UFS_SB(sb)->s_lock);
+                unlock_super(sb);
                 unlock_ufs(sb);
                 return -EINVAL;
 #else
@@ -1345,13 +1332,13 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
                     ufstype != UFS_MOUNT_UFSTYPE_SUNx86 &&
                     ufstype != UFS_MOUNT_UFSTYPE_UFS2) {
                         printk("this ufstype is read-only supported\n");
-                        mutex_unlock(&UFS_SB(sb)->s_lock);
+                        unlock_super(sb);
                         unlock_ufs(sb);
                         return -EINVAL;
                 }
                 if (!ufs_read_cylinder_structures(sb)) {
                         printk("failed during remounting\n");
-                        mutex_unlock(&UFS_SB(sb)->s_lock);
+                        unlock_super(sb);
                         unlock_ufs(sb);
                         return -EPERM;
                 }
@@ -1359,14 +1346,14 @@ static int ufs_remount (struct super_block *sb, int *mount_flags, char *data)
 #endif
         }
         UFS_SB(sb)->s_mount_opt = new_mount_opt;
-        mutex_unlock(&UFS_SB(sb)->s_lock);
+        unlock_super(sb);
         unlock_ufs(sb);
         return 0;
 }
 
-static int ufs_show_options(struct seq_file *seq, struct dentry *root)
+static int ufs_show_options(struct seq_file *seq, struct vfsmount *vfs)
 {
-        struct ufs_sb_info *sbi = UFS_SB(root->d_sb);
+        struct ufs_sb_info *sbi = UFS_SB(vfs->mnt_sb);
         unsigned mval = sbi->s_mount_opt & UFS_MOUNT_UFSTYPE;
         const struct match_token *tp = tokens;
 
@@ -1438,6 +1425,7 @@ static struct inode *ufs_alloc_inode(struct super_block *sb)
 static void ufs_i_callback(struct rcu_head *head)
 {
         struct inode *inode = container_of(head, struct inode, i_rcu);
+        INIT_LIST_HEAD(&inode->i_dentry);
         kmem_cache_free(ufs_inode_cachep, UFS_I(inode));
 }
 
@@ -1467,11 +1455,6 @@ static int init_inodecache(void)
 
 static void destroy_inodecache(void)
 {
-        /*
-         * Make sure all delayed rcu free inodes are flushed before we
-         * destroy cache.
-         */
-        rcu_barrier();
         kmem_cache_destroy(ufs_inode_cachep);
 }
 
@@ -1481,6 +1464,7 @@ static const struct super_operations ufs_super_ops = {
         .write_inode    = ufs_write_inode,
         .evict_inode    = ufs_evict_inode,
         .put_super      = ufs_put_super,
+        .write_super    = ufs_write_super,
         .sync_fs        = ufs_sync_fs,
         .statfs         = ufs_statfs,
         .remount_fs     = ufs_remount,
diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h
index ff2c15ab81a..5be2755dd71 100644
--- a/fs/ufs/ufs.h
+++ b/fs/ufs/ufs.h
@@ -20,11 +20,6 @@ struct ufs_sb_info {
         unsigned s_mount_opt;
         struct mutex mutex;
         struct task_struct *mutex_owner;
-        struct super_block *sb;
-        int work_queued; /* non-zero if the delayed work is queued */
-        struct delayed_work sync_work; /* FS sync delayed work */
-        spinlock_t work_lock; /* protects sync_work and work_queued */
-        struct mutex s_lock;
 };
 
 struct ufs_inode_info {
@@ -109,7 +104,7 @@ extern const struct address_space_operations ufs_aops;
 
 /* ialloc.c */
 extern void ufs_free_inode (struct inode *inode);
-extern struct inode * ufs_new_inode (struct inode *, umode_t);
+extern struct inode * ufs_new_inode (struct inode *, int);
 
 /* inode.c */
 extern struct inode *ufs_iget(struct super_block *, unsigned long);
@@ -122,13 +117,9 @@ extern int ufs_getfrag_block (struct inode *inode, sector_t fragment, struct buf
 extern const struct file_operations ufs_dir_operations;
 
 /* super.c */
-extern __printf(3, 4)
-void ufs_warning(struct super_block *, const char *, const char *, ...);
-extern __printf(3, 4)
-void ufs_error(struct super_block *, const char *, const char *, ...);
-extern __printf(3, 4)
-void ufs_panic(struct super_block *, const char *, const char *, ...);
-void ufs_mark_sb_dirty(struct super_block *sb);
+extern void ufs_warning (struct super_block *, const char *, const char *, ...) __attribute__ ((format (printf, 3, 4)));
+extern void ufs_error (struct super_block *, const char *, const char *, ...) __attribute__ ((format (printf, 3, 4)));
+extern void ufs_panic (struct super_block *, const char *, const char *, ...) __attribute__ ((format (printf, 3, 4)));
 
 /* symlink.c */
 extern const struct inode_operations ufs_fast_symlink_inode_operations;
diff --git a/fs/ufs/ufs_fs.h b/fs/ufs/ufs_fs.h
index 0cbd5d340b6..8aba544f9fa 100644
--- a/fs/ufs/ufs_fs.h
+++ b/fs/ufs/ufs_fs.h
@@ -34,7 +34,6 @@
 #include <linux/kernel.h>
 #include <linux/stat.h>
 #include <linux/fs.h>
-#include <linux/workqueue.h>
 
 #include <asm/div64.h>
 typedef __u64 __bitwise __fs64;