1 files changed, 128 insertions, 65 deletions

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 4295ca91cf85..fb34ad03e224 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -170,7 +170,7 @@ out:
  * @locked_page - for ufs_new_fragments()
  */
 static struct buffer_head *
-ufs_inode_getfrag(struct inode *inode, unsigned int fragment,
+ufs_inode_getfrag(struct inode *inode, u64 fragment,
                   sector_t new_fragment, unsigned int required, int *err,
                   long *phys, int *new, struct page *locked_page)
 {
@@ -178,12 +178,12 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment,
         struct super_block *sb = inode->i_sb;
         struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
         struct buffer_head * result;
-        unsigned block, blockoff, lastfrag, lastblock, lastblockoff;
-        unsigned tmp, goal;
-        __fs32 * p, * p2;
+        unsigned blockoff, lastblockoff;
+        u64 tmp, goal, lastfrag, block, lastblock;
+        void *p, *p2;
 
-        UFSD("ENTER, ino %lu, fragment %u, new_fragment %llu, required %u, "
-             "metadata %d\n", inode->i_ino, fragment,
+        UFSD("ENTER, ino %lu, fragment %llu, new_fragment %llu, required %u, "
+             "metadata %d\n", inode->i_ino, (unsigned long long)fragment,
              (unsigned long long)new_fragment, required, !phys);
 
         /* TODO : to be done for write support
@@ -193,17 +193,20 @@ ufs_inode_getfrag(struct inode *inode, unsigned int fragment,
 
         block = ufs_fragstoblks (fragment);
         blockoff = ufs_fragnum (fragment);
-        p = ufsi->i_u1.i_data + block;
+        p = ufs_get_direct_data_ptr(uspi, ufsi, block);
+
         goal = 0;
 
 repeat:
-        tmp = fs32_to_cpu(sb, *p);
+        tmp = ufs_data_ptr_to_cpu(sb, p);
+
         lastfrag = ufsi->i_lastfrag;
         if (tmp && fragment < lastfrag) {
                 if (!phys) {
                         result = sb_getblk(sb, uspi->s_sbbase + tmp + blockoff);
-                        if (tmp == fs32_to_cpu(sb, *p)) {
-                                UFSD("EXIT, result %u\n", tmp + blockoff);
+                        if (tmp == ufs_data_ptr_to_cpu(sb, p)) {
+                                UFSD("EXIT, result %llu\n",
+                                     (unsigned long long)tmp + blockoff);
                                 return result;
                         }
                         brelse (result);
@@ -224,10 +227,11 @@ repeat:
                  * We must reallocate last allocated block
                  */
                 if (lastblockoff) {
-                        p2 = ufsi->i_u1.i_data + lastblock;
-                        tmp = ufs_new_fragments (inode, p2, lastfrag, 
-                                                 fs32_to_cpu(sb, *p2), uspi->s_fpb - lastblockoff,
-                                                 err, locked_page);
+                        p2 = ufs_get_direct_data_ptr(uspi, ufsi, lastblock);
+                        tmp = ufs_new_fragments(inode, p2, lastfrag,
+                                                ufs_data_ptr_to_cpu(sb, p2),
+                                                uspi->s_fpb - lastblockoff,
+                                                err, locked_page);
                         if (!tmp) {
                                 if (lastfrag != ufsi->i_lastfrag)
                                         goto repeat;
@@ -237,27 +241,31 @@ repeat:
                         lastfrag = ufsi->i_lastfrag;
                         
                 }
-                tmp = fs32_to_cpu(sb, ufsi->i_u1.i_data[lastblock]);
+                tmp = ufs_data_ptr_to_cpu(sb,
+                                         ufs_get_direct_data_ptr(uspi, ufsi,
+                                                                 lastblock));
                 if (tmp)
                         goal = tmp + uspi->s_fpb;
                 tmp = ufs_new_fragments (inode, p, fragment - blockoff, 
                                          goal, required + blockoff,
                                          err,
                                          phys != NULL ? locked_page : NULL);
-        }
+        } else if (lastblock == block) {
         /*
          * We will extend last allocated block
          */
-        else if (lastblock == block) {
-                tmp = ufs_new_fragments(inode, p, fragment - (blockoff - lastblockoff),
-                                        fs32_to_cpu(sb, *p), required +  (blockoff - lastblockoff),
+                tmp = ufs_new_fragments(inode, p, fragment -
+                                        (blockoff - lastblockoff),
+                                        ufs_data_ptr_to_cpu(sb, p),
+                                        required +  (blockoff - lastblockoff),
                                         err, phys != NULL ? locked_page : NULL);
         } else /* (lastblock > block) */ {
         /*
          * We will allocate new block before last allocated block
          */
                 if (block) {
-                        tmp = fs32_to_cpu(sb, ufsi->i_u1.i_data[block-1]);
+                        tmp = ufs_data_ptr_to_cpu(sb,
+                                                 ufs_get_direct_data_ptr(uspi, ufsi, block - 1));
                         if (tmp)
                                 goal = tmp + uspi->s_fpb;
                 }
@@ -266,7 +274,7 @@ repeat:
                                         phys != NULL ? locked_page : NULL);
         }
         if (!tmp) {
-                if ((!blockoff && *p) || 
+                if ((!blockoff && ufs_data_ptr_to_cpu(sb, p)) ||
                     (blockoff && lastfrag != ufsi->i_lastfrag))
                         goto repeat;
                 *err = -ENOSPC;
@@ -286,7 +294,7 @@ repeat:
         if (IS_SYNC(inode))
                 ufs_sync_inode (inode);
         mark_inode_dirty(inode);
-        UFSD("EXIT, result %u\n", tmp + blockoff);
+        UFSD("EXIT, result %llu\n", (unsigned long long)tmp + blockoff);
         return result;
 
      /* This part : To be implemented ....
@@ -320,20 +328,22 @@ repeat2:
  */
 static struct buffer_head *
 ufs_inode_getblock(struct inode *inode, struct buffer_head *bh,
-                  unsigned int fragment, sector_t new_fragment, int *err,
+                  u64 fragment, sector_t new_fragment, int *err,
                   long *phys, int *new, struct page *locked_page)
 {
         struct super_block *sb = inode->i_sb;
         struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
         struct buffer_head * result;
-        unsigned tmp, goal, block, blockoff;
-        __fs32 * p;
+        unsigned blockoff;
+        u64 tmp, goal, block;
+        void *p;
 
         block = ufs_fragstoblks (fragment);
         blockoff = ufs_fragnum (fragment);
 
-        UFSD("ENTER, ino %lu, fragment %u, new_fragment %llu, metadata %d\n",
-             inode->i_ino, fragment, (unsigned long long)new_fragment, !phys);
+        UFSD("ENTER, ino %lu, fragment %llu, new_fragment %llu, metadata %d\n",
+             inode->i_ino, (unsigned long long)fragment,
+             (unsigned long long)new_fragment, !phys);
 
         result = NULL;
         if (!bh)
@@ -344,14 +354,16 @@ ufs_inode_getblock(struct inode *inode, struct buffer_head *bh,
                 if (!buffer_uptodate(bh))
                         goto out;
         }
-
-        p = (__fs32 *) bh->b_data + block;
+        if (uspi->fs_magic == UFS2_MAGIC)
+                p = (__fs64 *)bh->b_data + block;
+        else
+                p = (__fs32 *)bh->b_data + block;
 repeat:
-        tmp = fs32_to_cpu(sb, *p);
+        tmp = ufs_data_ptr_to_cpu(sb, p);
         if (tmp) {
                 if (!phys) {
                         result = sb_getblk(sb, uspi->s_sbbase + tmp + blockoff);
-                        if (tmp == fs32_to_cpu(sb, *p))
+                        if (tmp == ufs_data_ptr_to_cpu(sb, p))
                                 goto out;
                         brelse (result);
                         goto repeat;
@@ -361,14 +373,16 @@ repeat:
                 }
         }
 
-        if (block && (tmp = fs32_to_cpu(sb, ((__fs32*)bh->b_data)[block-1])))
+        if (block && (uspi->fs_magic == UFS2_MAGIC ?
+                      (tmp = fs64_to_cpu(sb, ((__fs64 *)bh->b_data)[block-1])) :
+                      (tmp = fs32_to_cpu(sb, ((__fs32 *)bh->b_data)[block-1]))))
                 goal = tmp + uspi->s_fpb;
         else
                 goal = bh->b_blocknr + uspi->s_fpb;
         tmp = ufs_new_fragments(inode, p, ufs_blknum(new_fragment), goal,
                                 uspi->s_fpb, err, locked_page);
         if (!tmp) {
-                if (fs32_to_cpu(sb, *p))
+                if (ufs_data_ptr_to_cpu(sb, p))
                         goto repeat;
                 goto out;
         }               
@@ -386,7 +400,7 @@ repeat:
                 sync_dirty_buffer(bh);
         inode->i_ctime = CURRENT_TIME_SEC;
         mark_inode_dirty(inode);
-        UFSD("result %u\n", tmp + blockoff);
+        UFSD("result %llu\n", (unsigned long long)tmp + blockoff);
 out:
         brelse (bh);
         UFSD("EXIT\n");
@@ -616,8 +630,8 @@ static void ufs1_read_inode(struct inode *inode, struct ufs_inode *ufs_inode)
         inode->i_atime.tv_nsec = 0;
         inode->i_ctime.tv_nsec = 0;
         inode->i_blocks = fs32_to_cpu(sb, ufs_inode->ui_blocks);
+        inode->i_generation = fs32_to_cpu(sb, ufs_inode->ui_gen);
         ufsi->i_flags = fs32_to_cpu(sb, ufs_inode->ui_flags);
-        ufsi->i_gen = fs32_to_cpu(sb, ufs_inode->ui_gen);
         ufsi->i_shadow = fs32_to_cpu(sb, ufs_inode->ui_u3.ui_sun.ui_shadow);
         ufsi->i_oeftflag = fs32_to_cpu(sb, ufs_inode->ui_u3.ui_sun.ui_oeftflag);
 
@@ -661,8 +675,8 @@ static void ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode)
         inode->i_atime.tv_nsec = 0;
         inode->i_ctime.tv_nsec = 0;
         inode->i_blocks = fs64_to_cpu(sb, ufs2_inode->ui_blocks);
+        inode->i_generation = fs32_to_cpu(sb, ufs2_inode->ui_gen);
         ufsi->i_flags = fs32_to_cpu(sb, ufs2_inode->ui_flags);
-        ufsi->i_gen = fs32_to_cpu(sb, ufs2_inode->ui_gen);
         /*
         ufsi->i_shadow = fs32_to_cpu(sb, ufs_inode->ui_u3.ui_sun.ui_shadow);
         ufsi->i_oeftflag = fs32_to_cpu(sb, ufs_inode->ui_u3.ui_sun.ui_oeftflag);
@@ -731,34 +745,11 @@ bad_inode:
         make_bad_inode(inode);
 }
 
-static int ufs_update_inode(struct inode * inode, int do_sync)
+static void ufs1_update_inode(struct inode *inode, struct ufs_inode *ufs_inode)
 {
-        struct ufs_inode_info *ufsi = UFS_I(inode);
-        struct super_block * sb;
-        struct ufs_sb_private_info * uspi;
-        struct buffer_head * bh;
-        struct ufs_inode * ufs_inode;
-        unsigned i;
-        unsigned flags;
-
-        UFSD("ENTER, ino %lu\n", inode->i_ino);
-
-        sb = inode->i_sb;
-        uspi = UFS_SB(sb)->s_uspi;
-        flags = UFS_SB(sb)->s_flags;
-
-        if (inode->i_ino < UFS_ROOTINO || 
-            inode->i_ino > (uspi->s_ncg * uspi->s_ipg)) {
-                ufs_warning (sb, "ufs_read_inode", "bad inode number (%lu)\n", inode->i_ino);
-                return -1;
-        }
-
-        bh = sb_bread(sb, ufs_inotofsba(inode->i_ino));
-        if (!bh) {
-                ufs_warning (sb, "ufs_read_inode", "unable to read inode %lu\n", inode->i_ino);
-                return -1;
-        }
-        ufs_inode = (struct ufs_inode *) (bh->b_data + ufs_inotofsbo(inode->i_ino) * sizeof(struct ufs_inode));
+        struct super_block *sb = inode->i_sb;
+        struct ufs_inode_info *ufsi = UFS_I(inode);
+        unsigned i;
 
         ufs_inode->ui_mode = cpu_to_fs16(sb, inode->i_mode);
         ufs_inode->ui_nlink = cpu_to_fs16(sb, inode->i_nlink);
@@ -775,9 +766,9 @@ static int ufs_update_inode(struct inode * inode, int do_sync)
         ufs_inode->ui_mtime.tv_usec = 0;
         ufs_inode->ui_blocks = cpu_to_fs32(sb, inode->i_blocks);
         ufs_inode->ui_flags = cpu_to_fs32(sb, ufsi->i_flags);
-        ufs_inode->ui_gen = cpu_to_fs32(sb, ufsi->i_gen);
+        ufs_inode->ui_gen = cpu_to_fs32(sb, inode->i_generation);
 
-        if ((flags & UFS_UID_MASK) == UFS_UID_EFT) {
+        if ((UFS_SB(sb)->s_flags & UFS_UID_MASK) == UFS_UID_EFT) {
                 ufs_inode->ui_u3.ui_sun.ui_shadow = cpu_to_fs32(sb, ufsi->i_shadow);
                 ufs_inode->ui_u3.ui_sun.ui_oeftflag = cpu_to_fs32(sb, ufsi->i_oeftflag);
         }
@@ -796,6 +787,78 @@ static int ufs_update_inode(struct inode * inode, int do_sync)
 
         if (!inode->i_nlink)
                 memset (ufs_inode, 0, sizeof(struct ufs_inode));
+}
+
+static void ufs2_update_inode(struct inode *inode, struct ufs2_inode *ufs_inode)
+{
+        struct super_block *sb = inode->i_sb;
+        struct ufs_inode_info *ufsi = UFS_I(inode);
+        unsigned i;
+
+        UFSD("ENTER\n");
+        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, 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.tv_sec = cpu_to_fs32(sb, inode->i_atime.tv_sec);
+        ufs_inode->ui_atime.tv_usec = 0;
+        ufs_inode->ui_ctime.tv_sec = cpu_to_fs32(sb, inode->i_ctime.tv_sec);
+        ufs_inode->ui_ctime.tv_usec = 0;
+        ufs_inode->ui_mtime.tv_sec = cpu_to_fs32(sb, inode->i_mtime.tv_sec);
+        ufs_inode->ui_mtime.tv_usec = 0;
+
+        ufs_inode->ui_blocks = cpu_to_fs64(sb, inode->i_blocks);
+        ufs_inode->ui_flags = cpu_to_fs32(sb, ufsi->i_flags);
+        ufs_inode->ui_gen = cpu_to_fs32(sb, inode->i_generation);
+
+        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) {
+                /* ufs_inode->ui_u2.ui_addr.ui_db[0] = cpu_to_fs32(sb, inode->i_rdev); */
+                ufs_inode->ui_u2.ui_addr.ui_db[0] = ufsi->i_u1.u2_i_data[0];
+        } else if (inode->i_blocks) {
+                for (i = 0; i < (UFS_NDADDR + UFS_NINDIR); i++)
+                        ufs_inode->ui_u2.ui_addr.ui_db[i] = ufsi->i_u1.u2_i_data[i];
+        } else {
+                for (i = 0; i < (UFS_NDADDR + UFS_NINDIR) * 4; i++)
+                        ufs_inode->ui_u2.ui_symlink[i] = ufsi->i_u1.i_symlink[i];
+        }
+
+        if (!inode->i_nlink)
+                memset (ufs_inode, 0, sizeof(struct ufs2_inode));
+        UFSD("EXIT\n");
+}
+
+static int ufs_update_inode(struct inode * inode, int do_sync)
+{
+        struct super_block *sb = inode->i_sb;
+        struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi;
+        struct buffer_head * bh;
+
+        UFSD("ENTER, ino %lu\n", inode->i_ino);
+
+        if (inode->i_ino < UFS_ROOTINO ||
+            inode->i_ino > (uspi->s_ncg * uspi->s_ipg)) {
+                ufs_warning (sb, "ufs_read_inode", "bad inode number (%lu)\n", inode->i_ino);
+                return -1;
+        }
+
+        bh = sb_bread(sb, ufs_inotofsba(inode->i_ino));
+        if (!bh) {
+                ufs_warning (sb, "ufs_read_inode", "unable to read inode %lu\n", inode->i_ino);
+                return -1;
+        }
+        if (uspi->fs_magic == UFS2_MAGIC) {
+                struct ufs2_inode *ufs2_inode = (struct ufs2_inode *)bh->b_data;
+
+                ufs2_update_inode(inode,
+                                  ufs2_inode + ufs_inotofsbo(inode->i_ino));
+        } else {
+                struct ufs_inode *ufs_inode = (struct ufs_inode *) bh->b_data;
+
+                ufs1_update_inode(inode, ufs_inode + ufs_inotofsbo(inode->i_ino));
+        }
                 
         mark_buffer_dirty(bh);
         if (do_sync)