RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

if: move and merge compat check with bio

This commit is contained in:
Thomas Schoebel-Theuer 2019-02-20 11:32:05 +01:00 committed by Thomas Schoebel-Theuer
parent 873ae4de56
commit baf14f5b22
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/compat.h
View File

@ -70,9 +70,11 @@ extern int _compat_unlink(
#define HAS_BVEC_ITER #define HAS_BVEC_ITER
#endif #endif
/* adaptation to 4246a0b63bd8f56a1469b12eafeb875b1041a451 */ /* adaptation to 4246a0b63bd8f56a1469b12eafeb875b1041a451 and 8ae126660fddbeebb9251a174e6fa45b6ad8f932 */
#ifndef bio_io_error #ifndef bio_io_error
#define HAS_BI_ERROR #define HAS_BI_ERROR
#else
#define HAS_MERGE_BVEC
#endif #endif
/* adapt to 4e1b2d52a80d79296a5d899d73249748dea71a53 and many others */ /* adapt to 4e1b2d52a80d79296a5d899d73249748dea71a53 and many others */

6
kernel/mars_if.c
View File

@ -62,12 +62,6 @@
#include "lib_limiter.h" #include "lib_limiter.h"
// remove_this // remove_this
/* adaptation to 4246a0b63bd8f56a1469b12eafeb875b1041a451 and 8ae126660fddbeebb9251a174e6fa45b6ad8f932 */
#ifndef bio_io_error
#define HAS_BI_ERROR
#else
#define HAS_MERGE_BVEC
#endif
/* 54efd50bfd873e2dbf784e0b21a8027ba4299a3e and 8ae126660fddbeebb9251a174e6fa45b6ad8f932, /* 54efd50bfd873e2dbf784e0b21a8027ba4299a3e and 8ae126660fddbeebb9251a174e6fa45b6ad8f932,
* detected via 4246a0b63bd8f56a1469b12eafeb875b1041a451 * detected via 4246a0b63bd8f56a1469b12eafeb875b1041a451