blktap2: fix pause/unpause

diff --git a/master/blktap2-pause-unpause b/master/blktap2-pause-unpause
new file mode 100644 (file)
index 0000000..f3b77b2
--- /dev/null
+++ b/master/blktap2-pause-unpause
@@ -0,0 +1,51 @@
+diff --git a/drivers/xen/blktap2/sysfs.c b/drivers/xen/blktap2/sysfs.c
+index 5d5eb2a..c5e2037 100644
+--- a/drivers/xen/blktap2/sysfs.c
++++ b/drivers/xen/blktap2/sysfs.c
+@@ -152,11 +152,12 @@ blktap_sysfs_pause_device(struct device *dev,
+       }
+ 
+       err = blktap_device_pause(tap);
++/*
+       if (!err) {
+               device_remove_file(dev, &dev_attr_pause);
+               err = device_create_file(dev, &dev_attr_resume);
+       }
+-
++*/
+ out:
+       blktap_sysfs_exit(tap);
+ 
+@@ -185,11 +186,12 @@ blktap_sysfs_resume_device(struct device *dev,
+       }
+ 
+       err = blktap_device_resume(tap);
++/*
+       if (!err) {
+               device_remove_file(dev, &dev_attr_resume);
+               err = device_create_file(dev, &dev_attr_pause);
+       }
+-
++*/
+ out:
+       blktap_sysfs_exit(tap);
+ 
+@@ -324,12 +326,17 @@ blktap_sysfs_create(struct blktap *tap)
+       err = device_create_file(dev, &dev_attr_pause);
+       if (err)
+               goto out_unregister_remove;
+-      err = device_create_file(dev, &dev_attr_debug);
++      err = device_create_file(dev, &dev_attr_resume);
+       if (err)
+               goto out_unregister_pause;
++      err = device_create_file(dev, &dev_attr_debug);
++      if (err)
++              goto out_unregister_resume;
+ 
+       return 0;
+ 
++out_unregister_resume:
++      device_remove_file(dev, &dev_attr_resume);
+ out_unregister_pause:
+       device_remove_file(dev, &dev_attr_pause);
+ out_unregister_remove:

diff --git a/master/series b/master/series
index 2549eb9c4ca3f4e4dfd2ac641cd2f49dc2a05ae1..cb126befe7f190db40655fe8e90a89cb614f6dda 100644 (file)
--- a/master/series
+++ b/master/series
@@ -311,3 +311,4 @@ pass2-driver
 on-the-fly-cx-change
 bridge-carrier
 post-after-flr
+blktap2-pause-unpause