1 files changed, 6 insertions, 8 deletions

diff --git a/fs/ufs/util.c b/fs/ufs/util.c
index 22f820a9b15c..17437574f79c 100644
--- a/fs/ufs/util.c
+++ b/fs/ufs/util.c
@@ -184,14 +184,13 @@ void _ubh_memcpyubh_(struct ufs_sb_private_info * uspi,
 dev_t
 ufs_get_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi)
 {
-        __fs32 fs32;
+        __u32 fs32;
         dev_t dev;
 
         if ((UFS_SB(sb)->s_flags & UFS_ST_MASK) == UFS_ST_SUNx86)
-                fs32 = ufsi->i_u1.i_data[1];
+                fs32 = fs32_to_cpu(sb, ufsi->i_u1.i_data[1]);
         else
-                fs32 = ufsi->i_u1.i_data[0];
-        fs32 = fs32_to_cpu(sb, fs32);
+                fs32 = fs32_to_cpu(sb, ufsi->i_u1.i_data[0]);
         switch (UFS_SB(sb)->s_flags & UFS_ST_MASK) {
         case UFS_ST_SUNx86:
         case UFS_ST_SUN:
@@ -212,7 +211,7 @@ ufs_get_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi)
 void
 ufs_set_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi, dev_t dev)
 {
-        __fs32 fs32;
+        __u32 fs32;
 
         switch (UFS_SB(sb)->s_flags & UFS_ST_MASK) {
         case UFS_ST_SUNx86:
@@ -227,11 +226,10 @@ ufs_set_inode_dev(struct super_block *sb, struct ufs_inode_info *ufsi, dev_t dev
                 fs32 = old_encode_dev(dev);
                 break;
         }
-        fs32 = cpu_to_fs32(sb, fs32);
         if ((UFS_SB(sb)->s_flags & UFS_ST_MASK) == UFS_ST_SUNx86)
-                ufsi->i_u1.i_data[1] = fs32;
+                ufsi->i_u1.i_data[1] = cpu_to_fs32(sb, fs32);
         else
-                ufsi->i_u1.i_data[0] = fs32;
+                ufsi->i_u1.i_data[0] = cpu_to_fs32(sb, fs32);
 }
 
 /**