Author: zbyniu Date: Sun Mar 30 19:48:56 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- some hot fixes, will be merged in next rel
---- Files affected:
SOURCES:
linux-2.6-vs2.3.patch (1.2.4.11.2.18 -> 1.2.4.11.2.19)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.18
SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.19
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.18 Sun Mar 30 21:24:17 2008
+++ SOURCES/linux-2.6-vs2.3.patch Sun Mar 30 21:48:50 2008
@@ -2608,10 +2608,11 @@
diff -NurpP --minimal linux-2.6.24.4/fs/char_dev.c
linux-2.6.24.4-vs2.3.0.34/fs/char_dev.c
--- linux-2.6.24.4/fs/char_dev.c 2008-03-27 17:46:40 +0100
+++ linux-2.6.24.4-vs2.3.0.34/fs/char_dev.c 2008-03-27 19:38:02 +0100
-@@ -21,6 +21,7 @@
+@@ -21,6 +21,8 @@
#include <linux/cdev.h>
#include <linux/mutex.h>
#include <linux/backing-dev.h>
++#include <linux/vs_context.h>
+#include <linux/vs_device.h>
#ifdef CONFIG_KMOD
@@ -8045,7 +8046,7 @@
goto out;
}
-+ 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");
@@ -8071,16 +8072,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.18&r2=1.2.4.11.2.19&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
