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

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-07-20 13:44:42 -07:00
parent cca9361a36 25974dccd7
commit b8ce701cb4
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
module/zfs/include/sys/zfs_debug.h
View File

@ -55,8 +55,16 @@ extern int zfs_flags;
#ifdef ZFS_DEBUG #ifdef ZFS_DEBUG
#if defined(_KERNEL) && defined(HAVE_SPL) #if defined(_KERNEL) && defined(HAVE_SPL)
#include <sys/debug.h> /*
#define dprintf(...) CDEBUG_LIMIT(D_DPRINTF, __VA_ARGS__) * Log ZFS debug messages as the spl SS_USER1 subsystem.
*/
#include <spl-debug.h>
#ifdef SS_DEBUG_SUBSYS
#undef SS_DEBUG_SUBSYS
#endif
#define SS_DEBUG_SUBSYS SS_USER1
#define dprintf(...) SDEBUG_LIMIT(SD_DPRINTF, __VA_ARGS__)
#else #else
extern void __dprintf(const char *file, const char *func, extern void __dprintf(const char *file, const char *func,
int line, const char *fmt, ...); int line, const char *fmt, ...);

6
module/zfs/vdev_disk.c
View File

@ -235,15 +235,13 @@ BIO_END_IO_PROTO(vdev_disk_physio_completion, bio, size, error)
int rc; int rc;
/* Fatal error but print some useful debugging before asserting */ /* Fatal error but print some useful debugging before asserting */
if (dr == NULL) { if (dr == NULL)
printk("FATAL: bio->bi_private == NULL\n" PANIC("dr == NULL, bio->bi_private == NULL\n"
"bi_next: %p, bi_flags: %lx, bi_rw: %lu, bi_vcnt: %d\n" "bi_next: %p, bi_flags: %lx, bi_rw: %lu, bi_vcnt: %d\n"
"bi_idx: %d, bi_size: %d, bi_end_io: %p, bi_cnt: %d\n", "bi_idx: %d, bi_size: %d, bi_end_io: %p, bi_cnt: %d\n",
bio->bi_next, bio->bi_flags, bio->bi_rw, bio->bi_vcnt, bio->bi_next, bio->bi_flags, bio->bi_rw, bio->bi_vcnt,
bio->bi_idx, bio->bi_size, bio->bi_end_io, bio->bi_idx, bio->bi_size, bio->bi_end_io,
atomic_read(&bio->bi_cnt)); atomic_read(&bio->bi_cnt));
SBUG();
}
#ifndef HAVE_2ARGS_BIO_END_IO_T #ifndef HAVE_2ARGS_BIO_END_IO_T
if (bio->bi_size) if (bio->bi_size)