Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix multi-line error messages in blkdev_compat.h 

Fix multi-line error messages in blkdev_compat.h by changing
error-generating multi-line error messages to single line errors.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: bunder2015 <omfgbunder@gmail.com>
Closes #5860
This commit is contained in:
bunder2015 2017-03-07 12:54:55 -05:00 committed by Brian Behlendorf
parent 3ec3bc2167
commit 5fc73c46f9
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/linux/blkdev_compat.h
View File

@ -351,8 +351,6 @@ bio_set_flush(struct bio *bio)
bio_set_op_attrs(bio, 0, REQ_PREFLUSH); bio_set_op_attrs(bio, 0, REQ_PREFLUSH);
#else #else
#error "Allowing the build will cause bio_set_flush requests to be ignored." #error "Allowing the build will cause bio_set_flush requests to be ignored."
"Please file an issue report at: "
"https://github.com/zfsonlinux/zfs/issues/new"
#endif #endif
} }
@ -393,8 +391,7 @@ bio_is_flush(struct bio *bio)
#elif defined(REQ_FLUSH) #elif defined(REQ_FLUSH)
return (bio->bi_rw & REQ_FLUSH); return (bio->bi_rw & REQ_FLUSH);
#else #else
#error "Allowing the build will cause flush requests to be ignored. Please " #error "Allowing the build will cause flush requests to be ignored."
"file an issue report at: https://github.com/zfsonlinux/zfs/issues/new"
#endif #endif
} }
@ -413,8 +410,7 @@ bio_is_fua(struct bio *bio)
#elif defined(REQ_FUA) #elif defined(REQ_FUA)
return (bio->bi_rw & REQ_FUA); return (bio->bi_rw & REQ_FUA);
#else #else
#error "Allowing the build will cause fua requests to be ignored. Please " #error "Allowing the build will cause fua requests to be ignored."
"file an issue report at: https://github.com/zfsonlinux/zfs/issues/new"
#endif #endif
} }
@ -445,9 +441,8 @@ bio_is_discard(struct bio *bio)
#elif defined(REQ_DISCARD) #elif defined(REQ_DISCARD)
return (bio->bi_rw & REQ_DISCARD); return (bio->bi_rw & REQ_DISCARD);
#else #else
#error "Allowing the build will cause discard requests to become writes " /* potentially triggering the DMU_MAX_ACCESS assertion. */
"potentially triggering the DMU_MAX_ACCESS assertion. Please file " #error "Allowing the build will cause discard requests to become writes."
"an issue report at: https://github.com/zfsonlinux/zfs/issues/new"
#endif #endif
} }