Add in SunOS 4.1.x compatible mode for UFS

Add in support for SunOS 4.1.x flavor of BSD 4.2 UFS filing system Macros have
been put in to alow suport for the old static table Cylinder Groups but this
implementation does not use them yet.

This also fixes Solaris UFS filing system access by disabling fast symbolic
links as Sun's version of UFS does not support on-disk fast symbolic links.

Tested by:
  Ppartitioning a new disk using SunOS 4.1.1, creating a UFS filing system on
  one of the partitions and writing some files to the filing system.
  Using Linux-2.6.22 (patched) to read the files and then write a shed load of
  files to the UFS partition.
  Using SunOS 4.1.1 to verify the filing system is OK and to check the files.
The test host is a sun4c SS1 Clone.

[akpm@linux-foundation.org: coding style fixes]
[adobriyan@gmail.com: fix oops]
Signed-off-by: Mark Fortescue <mark@mtfhpc.demon.co.uk>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 38 insertions, 12 deletions

diff --git a/fs/ufs/util.h b/fs/ufs/util.h
index 79a340a1909e..b26fc4dec1e7 100644
--- a/fs/ufs/util.h
+++ b/fs/ufs/util.h
@@ -38,6 +38,10 @@ ufs_get_fs_state(struct super_block *sb, struct ufs_super_block_first *usb1,
                  struct ufs_super_block_third *usb3)
 {
         switch (UFS_SB(sb)->s_flags & UFS_ST_MASK) {
+        case UFS_ST_SUNOS:
+                if (fs32_to_cpu(sb, usb3->fs_postblformat) == UFS_42POSTBLFMT)
+                        return fs32_to_cpu(sb, usb1->fs_u0.fs_sun.fs_state);
+                /* Fall Through to UFS_ST_SUN */
         case UFS_ST_SUN:
                 return fs32_to_cpu(sb, usb3->fs_un2.fs_sun.fs_state);
         case UFS_ST_SUNx86:
@@ -53,6 +57,12 @@ ufs_set_fs_state(struct super_block *sb, struct ufs_super_block_first *usb1,
                  struct ufs_super_block_third *usb3, s32 value)
 {
         switch (UFS_SB(sb)->s_flags & UFS_ST_MASK) {
+        case UFS_ST_SUNOS:
+                if (fs32_to_cpu(sb, usb3->fs_postblformat == UFS_42POSTBLFMT)) {
+                        usb1->fs_u0.fs_sun.fs_state = cpu_to_fs32(sb, value);
+                        break;
+                }
+                /* Fall Through to UFS_ST_SUN */
         case UFS_ST_SUN:
                 usb3->fs_un2.fs_sun.fs_state = cpu_to_fs32(sb, value);
                 break;
@@ -81,6 +91,7 @@ ufs_get_fs_qbmask(struct super_block *sb, struct ufs_super_block_third *usb3)
         __fs64 tmp;
 
         switch (UFS_SB(sb)->s_flags & UFS_ST_MASK) {
+        case UFS_ST_SUNOS:
         case UFS_ST_SUN:
                 ((__fs32 *)&tmp)[0] = usb3->fs_un2.fs_sun.fs_qbmask[0];
                 ((__fs32 *)&tmp)[1] = usb3->fs_un2.fs_sun.fs_qbmask[1];
@@ -104,6 +115,7 @@ ufs_get_fs_qfmask(struct super_block *sb, struct ufs_super_block_third *usb3)
         __fs64 tmp;
 
         switch (UFS_SB(sb)->s_flags & UFS_ST_MASK) {
+        case UFS_ST_SUNOS:
         case UFS_ST_SUN:
                 ((__fs32 *)&tmp)[0] = usb3->fs_un2.fs_sun.fs_qfmask[0];
                 ((__fs32 *)&tmp)[1] = usb3->fs_un2.fs_sun.fs_qfmask[1];
@@ -179,10 +191,12 @@ static inline u32
 ufs_get_inode_uid(struct super_block *sb, struct ufs_inode *inode)
 {
         switch (UFS_SB(sb)->s_flags & UFS_UID_MASK) {
-        case UFS_UID_EFT:
-                return fs32_to_cpu(sb, inode->ui_u3.ui_sun.ui_uid);
         case UFS_UID_44BSD:
                 return fs32_to_cpu(sb, inode->ui_u3.ui_44.ui_uid);
+        case UFS_UID_EFT:
+                if (inode->ui_u1.oldids.ui_suid == 0xFFFF)
+                        return fs32_to_cpu(sb, inode->ui_u3.ui_sun.ui_uid);
+                /* Fall through */
         default:
                 return fs16_to_cpu(sb, inode->ui_u1.oldids.ui_suid);
         }
@@ -192,24 +206,31 @@ static inline void
 ufs_set_inode_uid(struct super_block *sb, struct ufs_inode *inode, u32 value)
 {
         switch (UFS_SB(sb)->s_flags & UFS_UID_MASK) {
-        case UFS_UID_EFT:
-                inode->ui_u3.ui_sun.ui_uid = cpu_to_fs32(sb, value);
-                break;
         case UFS_UID_44BSD:
                 inode->ui_u3.ui_44.ui_uid = cpu_to_fs32(sb, value);
+                inode->ui_u1.oldids.ui_suid = cpu_to_fs16(sb, value);
+                break;
+        case UFS_UID_EFT:
+                inode->ui_u3.ui_sun.ui_uid = cpu_to_fs32(sb, value);
+                if (value > 0xFFFF)
+                        value = 0xFFFF;
+                /* Fall through */
+        default:
+                inode->ui_u1.oldids.ui_suid = cpu_to_fs16(sb, value);
                 break;
         }
-        inode->ui_u1.oldids.ui_suid = cpu_to_fs16(sb, value); 
 }
 
 static inline u32
 ufs_get_inode_gid(struct super_block *sb, struct ufs_inode *inode)
 {
         switch (UFS_SB(sb)->s_flags & UFS_UID_MASK) {
-        case UFS_UID_EFT:
-                return fs32_to_cpu(sb, inode->ui_u3.ui_sun.ui_gid);
         case UFS_UID_44BSD:
                 return fs32_to_cpu(sb, inode->ui_u3.ui_44.ui_gid);
+        case UFS_UID_EFT:
+                if (inode->ui_u1.oldids.ui_suid == 0xFFFF)
+                        return fs32_to_cpu(sb, inode->ui_u3.ui_sun.ui_gid);
+                /* Fall through */
         default:
                 return fs16_to_cpu(sb, inode->ui_u1.oldids.ui_sgid);
         }
@@ -219,14 +240,19 @@ static inline void
 ufs_set_inode_gid(struct super_block *sb, struct ufs_inode *inode, u32 value)
 {
         switch (UFS_SB(sb)->s_flags & UFS_UID_MASK) {
-        case UFS_UID_EFT:
-                inode->ui_u3.ui_sun.ui_gid = cpu_to_fs32(sb, value);
-                break;
         case UFS_UID_44BSD:
                 inode->ui_u3.ui_44.ui_gid = cpu_to_fs32(sb, value);
+                inode->ui_u1.oldids.ui_sgid =  cpu_to_fs16(sb, value);
+                break;
+        case UFS_UID_EFT:
+                inode->ui_u3.ui_sun.ui_gid = cpu_to_fs32(sb, value);
+                if (value > 0xFFFF)
+                        value = 0xFFFF;
+                /* Fall through */
+        default:
+                inode->ui_u1.oldids.ui_sgid =  cpu_to_fs16(sb, value);
                 break;
         }
-        inode->ui_u1.oldids.ui_sgid =  cpu_to_fs16(sb, value);
 }
 
 extern dev_t ufs_get_inode_dev(struct super_block *, struct ufs_inode_info *);