Commit b3a0fd4d authored by Alex Viskovatoff's avatar Alex Viskovatoff Committed by Linus Torvalds

fs/ufs: recognize Solaris-specific file system state

Recent releases of Solaris set the fs_clean state of an unmounted UFS file
system as FSLOG ("logging fs").  However, the Linux kernel currently does
not recognize the value which represents this state.  Thus, attempting to
mount such a file system rw produces the message

kernel: ufs_read_super: can't grok fs_clean 0xfffffffd

and the file system is mounted read-only.  This patch makes the kernel
recognize that value.
Signed-off-by: default avatarAlex Viskovatoff <viskovatoff@imap.cc>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d7d4d849
...@@ -1016,6 +1016,9 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -1016,6 +1016,9 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
case UFS_FSSTABLE: case UFS_FSSTABLE:
UFSD("fs is stable\n"); UFSD("fs is stable\n");
break; break;
case UFS_FSLOG:
UFSD("fs is logging fs\n");
break;
case UFS_FSOSF1: case UFS_FSOSF1:
UFSD("fs is DEC OSF/1\n"); UFSD("fs is DEC OSF/1\n");
break; break;
......
...@@ -138,6 +138,7 @@ typedef __u16 __bitwise __fs16; ...@@ -138,6 +138,7 @@ typedef __u16 __bitwise __fs16;
#define UFS_USEEFT ((__u16)65535) #define UFS_USEEFT ((__u16)65535)
/* fs_clean values */
#define UFS_FSOK 0x7c269d38 #define UFS_FSOK 0x7c269d38
#define UFS_FSACTIVE ((__s8)0x00) #define UFS_FSACTIVE ((__s8)0x00)
#define UFS_FSCLEAN ((__s8)0x01) #define UFS_FSCLEAN ((__s8)0x01)
...@@ -145,6 +146,11 @@ typedef __u16 __bitwise __fs16; ...@@ -145,6 +146,11 @@ typedef __u16 __bitwise __fs16;
#define UFS_FSOSF1 ((__s8)0x03) /* is this correct for DEC OSF/1? */ #define UFS_FSOSF1 ((__s8)0x03) /* is this correct for DEC OSF/1? */
#define UFS_FSBAD ((__s8)0xff) #define UFS_FSBAD ((__s8)0xff)
/* Solaris-specific fs_clean values */
#define UFS_FSSUSPEND ((__s8)0xfe) /* temporarily suspended */
#define UFS_FSLOG ((__s8)0xfd) /* logging fs */
#define UFS_FSFIX ((__s8)0xfc) /* being repaired while mounted */
/* From here to next blank line, s_flags for ufs_sb_info */ /* From here to next blank line, s_flags for ufs_sb_info */
/* directory entry encoding */ /* directory entry encoding */
#define UFS_DE_MASK 0x00000010 /* mask for the following */ #define UFS_DE_MASK 0x00000010 /* mask for the following */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment