Commit acaa079b authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Jim Harris
Browse files

RPC: rename RPC aio_bdev series 



RPC: rename RPC construct_aio_bdev to bdev_aio_create
RPC: rename RPC delete_aio_bdev to bdev_aio_delete

Change-Id: I09ffc3cc0d2117f7210be7920bffddb9d7c7f30c
Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465035


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent cc6314a4

doc/bdev.md

+5 −5
Original line number Diff line number Diff line
@@ -315,22 +315,22 @@ The SPDK AIO bdev driver provides SPDK block layer access to Linux kernel block 
devices or a file on a Linux filesystem via Linux AIO. Note that O_DIRECT is

used and thus bypasses the Linux page cache. This mode is probably as close to

a typical kernel based target as a user space target can get without using a

user-space driver. To create AIO bdev RPC command `construct_aio_bdev` should be

user-space driver. To create AIO bdev RPC command `bdev_aio_create` should be

used.



Example commands



`rpc.py construct_aio_bdev /dev/sda aio0`

`rpc.py bdev_aio_create /dev/sda aio0`



This command will create `aio0` device from /dev/sda.



`rpc.py construct_aio_bdev /tmp/file file 8192`

`rpc.py bdev_aio_create /tmp/file file 8192`



This command will create `file` device with block size 8192 from /tmp/file.



To delete an aio bdev use the delete_aio_bdev command.

To delete an aio bdev use the bdev_aio_delete command.



`rpc.py delete_aio_bdev aio0`

`rpc.py bdev_aio_delete aio0`



# OCF Virtual bdev {#bdev_config_cas}

doc/jsonrpc.md

+6 −6
Original line number Diff line number Diff line
@@ -283,8 +283,8 @@ Example response: 
    "construct_virtio_dev",

    "get_virtio_scsi_devs",

    "remove_virtio_bdev",

    "delete_aio_bdev",

    "construct_aio_bdev",

    "bdev_aio_delete",

    "bdev_aio_create",

    "destruct_split_vbdev",

    "construct_split_vbdev",

    "bdev_inject_error",
@@ -1311,7 +1311,7 @@ Example response: 
}

~~~



## construct_aio_bdev {#rpc_construct_aio_bdev}

## bdev_aio_create {#rpc_bdev_aio_create}



Construct @ref bdev_config_aio.
@@ -1339,7 +1339,7 @@ Example request: 
    "filename": "/tmp/aio_bdev_file"

  },

  "jsonrpc": "2.0",

  "method": "construct_aio_bdev",

  "method": "bdev_aio_create",

  "id": 1

}

~~~
@@ -1354,7 +1354,7 @@ Example response: 
}

~~~



## delete_aio_bdev {#rpc_delete_aio_bdev}

## bdev_aio_delete {#rpc_bdev_aio_delete}



Delete @ref bdev_config_aio.
@@ -1374,7 +1374,7 @@ Example request: 
    "name": "Aio0"

  },

  "jsonrpc": "2.0",

  "method": "delete_aio_bdev",

  "method": "bdev_aio_delete",

  "id": 1

}

~~~

lib/bdev/aio/bdev_aio.c

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ bdev_aio_write_json_config(struct spdk_bdev *bdev, struct spdk_json_write_ctx *w 


	spdk_json_write_object_begin(w);



	spdk_json_write_named_string(w, "method", "construct_aio_bdev");

	spdk_json_write_named_string(w, "method", "bdev_aio_create");



	spdk_json_write_named_object_begin(w, "params");

	spdk_json_write_named_string(w, "name", bdev->name);
@@ -703,7 +703,7 @@ aio_bdev_unregister_cb(void *arg, int bdeverrno) 
}



void

delete_aio_bdev(struct spdk_bdev *bdev, delete_aio_bdev_complete cb_fn, void *cb_arg)

bdev_aio_delete(struct spdk_bdev *bdev, delete_aio_bdev_complete cb_fn, void *cb_arg)

{

	struct delete_aio_bdev_ctx *ctx;

lib/bdev/aio/bdev_aio.h

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,6 @@ typedef void (*delete_aio_bdev_complete)(void *cb_arg, int bdeverrno); 


int create_aio_bdev(const char *name, const char *filename, uint32_t block_size);



void delete_aio_bdev(struct spdk_bdev *bdev, delete_aio_bdev_complete cb_fn, void *cb_arg);

void bdev_aio_delete(struct spdk_bdev *bdev, delete_aio_bdev_complete cb_fn, void *cb_arg);



#endif /* SPDK_BDEV_AIO_H */

lib/bdev/aio/bdev_aio_rpc.c

+9 −7
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static const struct spdk_json_object_decoder rpc_construct_aio_decoders[] = { 
};



static void

spdk_rpc_construct_aio_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_aio_create(struct spdk_jsonrpc_request *request,

			 const struct spdk_json_val *params)

{

	struct rpc_construct_aio req = {};
@@ -87,7 +87,8 @@ spdk_rpc_construct_aio_bdev(struct spdk_jsonrpc_request *request, 
cleanup:

	free_rpc_construct_aio(&req);

}

SPDK_RPC_REGISTER("construct_aio_bdev", spdk_rpc_construct_aio_bdev, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_aio_create", spdk_rpc_bdev_aio_create, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_aio_create, construct_aio_bdev)



struct rpc_delete_aio {

	char *name;
@@ -104,7 +105,7 @@ static const struct spdk_json_object_decoder rpc_delete_aio_decoders[] = { 
};



static void

_spdk_rpc_delete_aio_bdev_cb(void *cb_arg, int bdeverrno)

_spdk_rpc_bdev_aio_delete_cb(void *cb_arg, int bdeverrno)

{

	struct spdk_jsonrpc_request *request = cb_arg;

	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
@@ -114,7 +115,7 @@ _spdk_rpc_delete_aio_bdev_cb(void *cb_arg, int bdeverrno) 
}



static void

spdk_rpc_delete_aio_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_aio_delete(struct spdk_jsonrpc_request *request,

			 const struct spdk_json_val *params)

{

	struct rpc_delete_aio req = {NULL};
@@ -134,7 +135,7 @@ spdk_rpc_delete_aio_bdev(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	delete_aio_bdev(bdev, _spdk_rpc_delete_aio_bdev_cb, request);

	bdev_aio_delete(bdev, _spdk_rpc_bdev_aio_delete_cb, request);



	free_rpc_delete_aio(&req);
@@ -143,4 +144,5 @@ spdk_rpc_delete_aio_bdev(struct spdk_jsonrpc_request *request, 
cleanup:

	free_rpc_delete_aio(&req);

}

SPDK_RPC_REGISTER("delete_aio_bdev", spdk_rpc_delete_aio_bdev, SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER("bdev_aio_delete", spdk_rpc_bdev_aio_delete, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_aio_delete, delete_aio_bdev)