Author: arekm                        Date: Fri Jan 18 20:51:45 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- ocfs2 fixes

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.4.11.2.13 -> 1.2.4.11.2.14) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.13 
SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.14
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.13 Fri Jan 18 15:53:49 2008
+++ SOURCES/linux-2.6-vs2.3.patch       Fri Jan 18 21:51:38 2008
@@ -7497,7 +7497,7 @@
        }
  
 +      printk("ocfs2_remount: %lx,%lx\n", osb->s_mount_opt, sb->s_flags);
-+      if ((parsed_options & OCFS2_MOUNT_TAGGED) &&
++      if ((parsed_options.mount_opt & OCFS2_MOUNT_TAGGED) &&
 +              !(sb->s_flags & MS_TAGGED)) {
 +              ret = -EINVAL;
 +              mlog(ML_ERROR, "Cannot change tagging on remount\n");
@@ -7523,16 +7523,16 @@
                        break;
 +#ifndef CONFIG_TAGGING_NONE
 +              case Opt_tag:
-+                      *mount_opt |= OCFS2_MOUNT_TAGGED;
++                      mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
 +                      break;
 +              case Opt_notag:
-+                      *mount_opt &= ~OCFS2_MOUNT_TAGGED;
++                      mopt->mount_opt &= ~OCFS2_MOUNT_TAGGED;
 +                      break;
 +#endif
 +#ifdef CONFIG_PROPAGATE
 +              case Opt_tagid:
 +                      /* use args[0] */
-+                      *mount_opt |= OCFS2_MOUNT_TAGGED;
++                      mopt->mount_opt |= OCFS2_MOUNT_TAGGED;
 +                      break;
 +#endif
                default:
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.4.11.2.13&r2=1.2.4.11.2.14&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to