Skip to content

Commit

Permalink
Merge pull request #5980 from grom72/disable-5979
Browse files Browse the repository at this point in the history
pmem: disable flag verification until #5979 is fixed
  • Loading branch information
janekmi authored Jan 25, 2024
2 parents 0153692 + ac4f3c9 commit 069c860
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions src/libpmem/pmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -573,10 +573,18 @@ pmem_memmove(void *pmemdest, const void *src, size_t len, unsigned flags)
LOG(15, "pmemdest %p src %p len %zu flags 0x%x",
pmemdest, src, len, flags);

/*
* XXX
* Disable this warning until #5979 is fixed
* https://github.com/pmem/pmdk/issues/5979
*/
#if 0
#ifdef DEBUG
if (flags & ~PMEM_F_MEM_VALID_FLAGS)
ERR("invalid flags 0x%x", flags);
#endif
#endif

PMEM_API_START();
Funcs.memmove_nodrain(pmemdest, src, len, flags & ~PMEM_F_MEM_NODRAIN,
Funcs.flush, &Funcs.memmove_funcs);
Expand All @@ -597,10 +605,17 @@ pmem_memcpy(void *pmemdest, const void *src, size_t len, unsigned flags)
LOG(15, "pmemdest %p src %p len %zu flags 0x%x",
pmemdest, src, len, flags);

/*
* Disable this warning until #5979 is fixed
* https://github.com/pmem/pmdk/issues/5979
*/
#if 0
#ifdef DEBUG
if (flags & ~PMEM_F_MEM_VALID_FLAGS)
ERR("invalid flags 0x%x", flags);
#endif
#endif

PMEM_API_START();
Funcs.memmove_nodrain(pmemdest, src, len, flags & ~PMEM_F_MEM_NODRAIN,
Funcs.flush, &Funcs.memmove_funcs);
Expand All @@ -621,9 +636,16 @@ pmem_memset(void *pmemdest, int c, size_t len, unsigned flags)
LOG(15, "pmemdest %p c 0x%x len %zu flags 0x%x",
pmemdest, c, len, flags);

/*
* XXX
* Disable this warning until #5979 is fixed
* https://github.com/pmem/pmdk/issues/5979
*/
#if 0
#ifdef DEBUG
if (flags & ~PMEM_F_MEM_VALID_FLAGS)
ERR("invalid flags 0x%x", flags);
#endif
#endif

PMEM_API_START();
Expand Down

0 comments on commit 069c860

Please sign in to comment.