dm-ioctl: Return data to userspace after rename ioctl is processed

Commit Message

Peter Rajnoha May 18, 2010, 1:48 p.m. UTC

None

Patch

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index d7500e1..f67ec28 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -49,6 +49,7 @@  struct vers_iter {
 static struct list_head _name_buckets[NUM_BUCKETS];
 static struct list_head _uuid_buckets[NUM_BUCKETS];
 
+static int __dev_status(struct mapped_device *md, struct dm_ioctl *param);
 static void dm_hash_remove_all(int keep_open_devices);
 
 /*
@@ -285,12 +286,12 @@  retry:
 	up_write(&_hash_lock);
 }
 
-static int dm_hash_rename(uint32_t cookie, uint32_t *flags, const char *old,
-			  const char *new)
+static int dm_hash_rename(struct dm_ioctl *param, const char *new)
 {
 	char *new_name, *old_name;
 	struct hash_cell *hc;
 	struct dm_table *table;
+	int r;
 
 	/*
 	 * duplicate new.
@@ -307,7 +308,7 @@  static int dm_hash_rename(uint32_t cookie, uint32_t *flags, const char *old,
 	hc = __get_name_cell(new);
 	if (hc) {
 		DMWARN("asked to rename to an already existing name %s -> %s",
-		       old, new);
+		       param->name, new);
 		dm_put(hc->md);
 		up_write(&_hash_lock);
 		kfree(new_name);
@@ -317,10 +318,10 @@  static int dm_hash_rename(uint32_t cookie, uint32_t *flags, const char *old,
 	/*
 	 * Is there such a device as 'old' ?
 	 */
-	hc = __get_name_cell(old);
+	hc = __get_name_cell(param->name);
 	if (!hc) {
 		DMWARN("asked to rename a non existent device %s -> %s",
-		       old, new);
+		       param->name, new);
 		up_write(&_hash_lock);
 		kfree(new_name);
 		return -ENXIO;
@@ -345,13 +346,15 @@  static int dm_hash_rename(uint32_t cookie, uint32_t *flags, const char *old,
 		dm_table_put(table);
 	}
 
-	if (!dm_kobject_uevent(hc->md, KOBJ_CHANGE, cookie))
-		*flags |= DM_UEVENT_GENERATED_FLAG;
+	if (!dm_kobject_uevent(hc->md, KOBJ_CHANGE, param->event_nr))
+		param->flags |= DM_UEVENT_GENERATED_FLAG;
+
+	r = __dev_status(hc->md, param);
 
 	dm_put(hc->md);
 	up_write(&_hash_lock);
 	kfree(old_name);
-	return 0;
+	return r;
 }
 
 /*-----------------------------------------------------------------
@@ -774,10 +777,7 @@  static int dev_rename(struct dm_ioctl *param, size_t param_size)
 	if (r)
 		return r;
 
-	param->data_size = 0;
-
-	return dm_hash_rename(param->event_nr, &param->flags, param->name,
-			      new_name);
+	return dm_hash_rename(param, new_name);
 }
 
 static int dev_set_geometry(struct dm_ioctl *param, size_t param_size)