github/ocf
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #359 from Ostrokrzew/discard_zero

Browse Source 
Reject discard IOs with size = 0
This commit is contained in:
Robert Baldyga 2020-05-20 22:59:59 +02:00 committed by GitHub
commit fa83465c55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/ocf_metadata.h
View File

@ -28,7 +28,7 @@ struct ocf_atomic_metadata {
/** Set bit indicates that given sector is valid (is cached) */ /** Set bit indicates that given sector is valid (is cached) */
uint32_t valid : 1; uint32_t valid : 1;
/** Set bit indicates that sector i dirty */ /** Set bit indicates that sector is dirty */
uint32_t dirty : 1; uint32_t dirty : 1;
} __attribute__((packed)); } __attribute__((packed));

2
src/engine/cache_engine.c
View File

@ -116,7 +116,7 @@ const struct ocf_io_if *ocf_get_io_if(ocf_req_cache_mode_t req_cache_mode)
return cache_mode_io_if_map[req_cache_mode]; return cache_mode_io_if_map[req_cache_mode];
} }
struct ocf_request *ocf_engine_pop_req(ocf_cache_t cache, ocf_queue_t q) struct ocf_request *ocf_engine_pop_req(ocf_queue_t q)
{ {
unsigned long lock_flags = 0; unsigned long lock_flags = 0;
struct ocf_request *req; struct ocf_request *req;

3
src/engine/cache_engine.h
View File

@ -66,8 +66,7 @@ static inline bool ocf_req_cache_mode_has_lazy_write(ocf_req_cache_mode_t mode)
bool ocf_fallback_pt_is_on(ocf_cache_t cache); bool ocf_fallback_pt_is_on(ocf_cache_t cache);
struct ocf_request *ocf_engine_pop_req(struct ocf_cache *cache, struct ocf_request *ocf_engine_pop_req(struct ocf_queue *q);
struct ocf_queue *q);
int ocf_engine_hndl_req(struct ocf_request *req); int ocf_engine_hndl_req(struct ocf_request *req);

5
src/ocf_core.c
View File

@ -392,6 +392,11 @@ static void ocf_core_volume_submit_discard(struct ocf_io *io)
OCF_CHECK_NULL(io); OCF_CHECK_NULL(io);
if (io->bytes == 0) {
ocf_io_end(io, -OCF_ERR_INVAL);
return;
}
ret = ocf_core_validate_io(io); ret = ocf_core_validate_io(io);
if (ret < 0) { if (ret < 0) {
ocf_io_end(io, ret); ocf_io_end(io, ret);

5
src/ocf_queue.c
View File

@ -86,13 +86,10 @@ void ocf_io_handle(struct ocf_io *io, void *opaque)
void ocf_queue_run_single(ocf_queue_t q) void ocf_queue_run_single(ocf_queue_t q)
{ {
struct ocf_request *io_req = NULL; struct ocf_request *io_req = NULL;
ocf_cache_t cache;
OCF_CHECK_NULL(q); OCF_CHECK_NULL(q);
cache = q->cache; io_req = ocf_engine_pop_req(q);
io_req = ocf_engine_pop_req(cache, q);
if (!io_req) if (!io_req)
return; return;

2
src/ocf_request.h
View File

@ -159,7 +159,7 @@ struct ocf_request {
/*! Last core line */ /*! Last core line */
uint32_t byte_length; uint32_t byte_length;
/*!< Byte length of OCF reuqest */ /*!< Byte length of OCF request */
uint32_t core_line_count; uint32_t core_line_count;
/*! Core line count */ /*! Core line count */