ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/ftl: Remove FTL_IO_KEEP_ALIVE flag from ftl_io_flags

Browse Source 
FTL_IO_KEEP_ALIVE flag is deprecated.

Change-Id: Id074f45a3e9ecb6d05c6a88a834476e2c19288a3
Signed-off-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/454326
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Wojciech Malikowski 2019-05-13 08:11:10 -04:00 committed by Darek Stojaczyk
parent 4769f058e0
commit a1f1581968
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ftl/ftl_io.c
View File

@ -434,7 +434,7 @@ void
ftl_io_complete(struct ftl_io *io) ftl_io_complete(struct ftl_io *io)
{ {
struct ftl_io *parent = io->parent; struct ftl_io *parent = io->parent;
bool complete, keep_alive = io->flags & FTL_IO_KEEP_ALIVE; bool complete;
io->flags &= ~FTL_IO_INITIALIZED; io->flags &= ~FTL_IO_INITIALIZED;
@ -452,9 +452,7 @@ ftl_io_complete(struct ftl_io *io)
ftl_io_complete(parent); ftl_io_complete(parent);
} }
if (!keep_alive) { _ftl_io_free(io);
_ftl_io_free(io);
}
} }
} }

20
lib/ftl/ftl_io.h
View File

@ -53,28 +53,26 @@ typedef void (*ftl_io_fn)(struct ftl_io *, void *, int);
enum ftl_io_flags { enum ftl_io_flags {
/* Indicates whether IO is already initialized */ /* Indicates whether IO is already initialized */
FTL_IO_INITIALIZED = (1 << 0), FTL_IO_INITIALIZED = (1 << 0),
/* Keep the IO when done with the request */
FTL_IO_KEEP_ALIVE = (1 << 1),
/* Internal based IO (defrag, metadata etc.) */ /* Internal based IO (defrag, metadata etc.) */
FTL_IO_INTERNAL = (1 << 2), FTL_IO_INTERNAL = (1 << 1),
/* Indicates that the IO should not go through if there's */ /* Indicates that the IO should not go through if there's */
/* already another one scheduled to the same LBA */ /* already another one scheduled to the same LBA */
FTL_IO_WEAK = (1 << 3), FTL_IO_WEAK = (1 << 2),
/* Indicates that the IO is used for padding */ /* Indicates that the IO is used for padding */
FTL_IO_PAD = (1 << 4), FTL_IO_PAD = (1 << 3),
/* The IO operates on metadata */ /* The IO operates on metadata */
FTL_IO_MD = (1 << 5), FTL_IO_MD = (1 << 4),
/* Using PPA instead of LBA */ /* Using PPA instead of LBA */
FTL_IO_PPA_MODE = (1 << 6), FTL_IO_PPA_MODE = (1 << 5),
/* Indicates that IO contains noncontiguous LBAs */ /* Indicates that IO contains noncontiguous LBAs */
FTL_IO_VECTOR_LBA = (1 << 7), FTL_IO_VECTOR_LBA = (1 << 6),
/* Indicates that IO is being retried */ /* Indicates that IO is being retried */
FTL_IO_RETRY = (1 << 8), FTL_IO_RETRY = (1 << 7),
/* The IO is directed to non-volatile cache */ /* The IO is directed to non-volatile cache */
FTL_IO_CACHE = (1 << 9), FTL_IO_CACHE = (1 << 8),
/* Indicates that PPA should be taken from IO struct, */ /* Indicates that PPA should be taken from IO struct, */
/* not assigned by wptr, only works if wptr is also in direct mode */ /* not assigned by wptr, only works if wptr is also in direct mode */
FTL_IO_DIRECT_ACCESS = (1 << 10), FTL_IO_DIRECT_ACCESS = (1 << 9),
}; };
enum ftl_io_type { enum ftl_io_type {