Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=48ef09a16edcc98d1de60f66ed7f650c571907f4
Commit:     48ef09a16edcc98d1de60f66ed7f650c571907f4
Parent:     bcd6d4ecf6868ed57d4daae5d48e52d0752566d2
Author:     Satyam Sharma <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 23:26:53 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 08:42:51 2007 -0700

    ufs: Fix mount check in ufs_fill_super()
    
    The current code skips the check to verify whether the filesystem was
    previously cleanly unmounted, if (flags & UFS_ST_MASK) == UFS_ST_44BSD or
    UFS_ST_OLD.  This looks like an inadvertent bug that slipped in due to
    parantheses in the compound conditional to me, especially given that
    ufs_get_fs_state() handles the UFS_ST_44BSD case perfectly well.  So, let's
    fix the compound condition appropriately.
    
    Signed-off-by: Satyam Sharma <[EMAIL PROTECTED]>
    Cc: Evgeniy Dushistov <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 fs/ufs/super.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 4d72933..584cf12 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -933,19 +933,20 @@ magic_found:
                goto again;
        }
 
-       sbi->s_flags = flags;/*after that line some functions use s_flags*/
+       /* Set sbi->s_flags here, used by ufs_get_fs_state() below */
+       sbi->s_flags = flags;
        ufs_print_super_stuff(sb, usb1, usb2, usb3);
 
        /*
         * Check, if file system was correctly unmounted.
         * If not, make it read only.
         */
-       if (((flags & UFS_ST_MASK) == UFS_ST_44BSD) ||
-         ((flags & UFS_ST_MASK) == UFS_ST_OLD) ||
-         (((flags & UFS_ST_MASK) == UFS_ST_SUN || 
-           (flags & UFS_ST_MASK) == UFS_ST_SUNOS ||
-         (flags & UFS_ST_MASK) == UFS_ST_SUNx86) && 
-         (ufs_get_fs_state(sb, usb1, usb3) == (UFS_FSOK - fs32_to_cpu(sb, 
usb1->fs_time))))) {
+       if ((((flags & UFS_ST_MASK) == UFS_ST_44BSD)    ||
+            ((flags & UFS_ST_MASK) == UFS_ST_OLD)      ||
+            ((flags & UFS_ST_MASK) == UFS_ST_SUN)      ||
+            ((flags & UFS_ST_MASK) == UFS_ST_SUNOS)    ||
+            ((flags & UFS_ST_MASK) == UFS_ST_SUNx86))  &&
+           (ufs_get_fs_state(sb, usb1, usb3) == (UFS_FSOK - fs32_to_cpu(sb, 
usb1->fs_time)))) {
                switch(usb1->fs_clean) {
                case UFS_FSCLEAN:
                        UFSD("fs is clean\n");
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to