rpms/kernel/devel linux-2.6-dm-fix-exstore-search.patch, NONE, 1.1 kernel.spec, 1.1596, 1.1597
Chuck Ebbert
cebbert at fedoraproject.org
Mon Jun 29 22:00:22 UTC 2009
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25224
Modified Files:
kernel.spec
Added Files:
linux-2.6-dm-fix-exstore-search.patch
Log Message:
Try to fix the dm overlay bug for real (#505121)
linux-2.6-dm-fix-exstore-search.patch:
--- NEW FILE linux-2.6-dm-fix-exstore-search.patch ---
--- linux-2.6.30.noarch.orig/drivers/md/dm-exception-store.c
+++ linux-2.6.30.noarch/drivers/md/dm-exception-store.c
@@ -197,7 +197,7 @@ int dm_exception_store_create(struct dm_
int r = 0;
struct dm_exception_store_type *type;
struct dm_exception_store *tmp_store;
- char persistent;
+ char persistent[2] = {0, 0};
if (argc < 3) {
ti->error = "Insufficient exception store arguments";
@@ -210,13 +210,15 @@ int dm_exception_store_create(struct dm_
return -ENOMEM;
}
- persistent = toupper(*argv[1]);
- if (persistent != 'P' && persistent != 'N') {
+ persistent[0] = toupper(*argv[1]);
+ if (persistent[0] != 'P' && persistent[0] != 'N') {
ti->error = "Persistent flag is not P or N";
return -EINVAL;
}
- type = get_type(&persistent);
+ type = get_type(argv[1]);
+ if (!type)
+ type = get_type(persistent);
if (!type) {
ti->error = "Exception store type not recognised";
r = -EINVAL;
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1596
retrieving revision 1.1597
diff -u -p -r1.1596 -r1.1597
--- kernel.spec 27 Jun 2009 02:28:30 -0000 1.1596
+++ kernel.spec 29 Jun 2009 21:59:51 -0000 1.1597
@@ -684,6 +684,9 @@ Patch10000: linux-2.6-missing-rfc2465-st
# VIA Nano / VX8xx updates
Patch11010: via-hwmon-temp-sensor.patch
+# temporary fixes
+Patch12000: linux-2.6-dm-fix-exstore-search.patch
+
# patches headed upstream
%endif
@@ -1246,6 +1249,7 @@ ApplyPatch linux-2.6-silence-acpi-blackl
#ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
# temporary fixes, headed upstream
+ApplyPatch linux-2.6-dm-fix-exstore-search.patch
# END OF PATCH APPLICATIONS
@@ -1846,6 +1850,9 @@ fi
# and build.
%changelog
+* Mon Jun 29 2009 Chuck Ebbert <cebbert at redhat.com>
+- Try to fix the dm overlay bug for real (#505121)
+
* Sat Jun 27 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31-0.33.rc1.git2
- drm-nouveau.patch: fix conflicts from 2.6.31-rc1-git2
More information about the scm-commits
mailing list