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

Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2010-07-14 12:50:59 -07:00
parent f9ee879cdd 4a1b926a81
commit 849bf9bd72
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
config/kernel.m4
View File

@ -84,13 +84,14 @@ AC_DEFUN([ZFS_AC_KERNEL], [
2>/dev/null | grep -v obj | tail -1) 2>/dev/null | grep -v obj | tail -1)
fi fi
if test -e $sourcelink; then if test -n "$sourcelink" && test -e ${sourcelink}; then
kernelsrc=`readlink -f ${sourcelink}` kernelsrc=`readlink -f ${sourcelink}`
else else
AC_MSG_RESULT([Not found]) AC_MSG_RESULT([Not found])
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Please specify the location of the kernel source *** Please make sure the kernel devel package for your distribution
*** with the '--with-linux=PATH' option]) *** is installed then try again. If that fails you can specify the
*** location of the kernel source with the '--with-linux=PATH' option.])
fi fi
else else
if test "$kernelsrc" = "NONE"; then if test "$kernelsrc" = "NONE"; then
@ -101,12 +102,12 @@ AC_DEFUN([ZFS_AC_KERNEL], [
AC_MSG_RESULT([$kernelsrc]) AC_MSG_RESULT([$kernelsrc])
AC_MSG_CHECKING([kernel build directory]) AC_MSG_CHECKING([kernel build directory])
if test -z "$kernelbuild"; then if test -z "$kernelbuild"; then
if test -d ${kernelsrc}-obj/`arch`/`arch`; then if test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then
kernelbuild=${kernelsrc}-obj/`arch`/`arch` kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu}
elif test -d ${kernelsrc}-obj/`arch`/default; then elif test -d ${kernelsrc}-obj/${target_cpu}/default; then
kernelbuild=${kernelsrc}-obj/`arch`/default kernelbuild=${kernelsrc}-obj/${target_cpu}/default
elif test -d `dirname ${kernelsrc}`/build-`arch`; then elif test -d `dirname ${kernelsrc}`/build-${target_cpu}; then
kernelbuild=`dirname ${kernelsrc}`/build-`arch` kernelbuild=`dirname ${kernelsrc}`/build-${target_cpu}
else else
kernelbuild=${kernelsrc} kernelbuild=${kernelsrc}
fi fi
@ -206,8 +207,9 @@ AC_DEFUN([ZFS_AC_SPL], [
else else
AC_MSG_RESULT([Not found]) AC_MSG_RESULT([Not found])
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Please specify the location of the spl source *** Please make sure the spl devel package for your distribution
*** with the '--with-spl=PATH' option]) *** is installed then try again. If that fails you can specify the
*** location of the spl source with the '--with-spl=PATH' option.])
fi fi
else else
if test "$splsrc" = "NONE"; then if test "$splsrc" = "NONE"; then

2
module/zfs/include/sys/blkdev.h
View File

@ -125,7 +125,7 @@ blk_end_request_x(struct request *req, int error, unsigned int nr_bytes)
bool rc; bool rc;
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);
__blk_end_request_x(req, error, nr_bytes); rc = __blk_end_request_x(req, error, nr_bytes);
spin_unlock_irq(q->queue_lock); spin_unlock_irq(q->queue_lock);
return rc; return rc;