mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 18:27:22 +00:00
Update build system and packaging
Minimal changes required to integrate the SPL sources in to the
ZFS repository build infrastructure and packaging.
Build system and packaging:
* Renamed SPL_* autoconf m4 macros to ZFS_*.
* Removed redundant SPL_* autoconf m4 macros.
* Updated the RPM spec files to remove SPL package dependency.
* The zfs package obsoletes the spl package, and the zfs-kmod
package obsoletes the spl-kmod package.
* The zfs-kmod-devel* packages were updated to add compatibility
symlinks under /usr/src/spl-x.y.z until all dependent packages
can be updated. They will be removed in a future release.
* Updated copy-builtin script for in-kernel builds.
* Updated DKMS package to include the spl.ko.
* Updated stale AUTHORS file to include all contributors.
* Updated stale COPYRIGHT and included the SPL as an exception.
* Renamed README.markdown to README.md
* Renamed OPENSOLARIS.LICENSE to LICENSE.
* Renamed DISCLAIMER to NOTICE.
Required code changes:
* Removed redundant HAVE_SPL macro.
* Removed _BOOT from nvpairs since it doesn't apply for Linux.
* Initial header cleanup (removal of empty headers, refactoring).
* Remove SPL repository clone/build from zimport.sh.
* Use of DEFINE_RATELIMIT_STATE and DEFINE_SPINLOCK removed due
to build issues when forcing C99 compilation.
* Replaced legacy ACCESS_ONCE with READ_ONCE.
* Include needed headers for `current` and `EXPORT_SYMBOL`.
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Pavel Zakharov <pavel.zakharov@delphix.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
TEST_ZIMPORT_SKIP="yes"
Closes #7556
This commit is contained in:
Brian Behlendorf
parent
1272941f49
commit
93ce2b4ca5
389
AUTHORS
389
AUTHORS
|
|
@ -1,95 +1,304 @@
|
|||
Brian Behlendorf is the principal developer of the ZFS on Linux port.
|
||||
He works full time as a computer scientist at Lawrence Livermore
|
||||
National Laboratory on the ZFS and Lustre filesystems. However,
|
||||
this port would not have been possible without the help of many
|
||||
others who have contributed their time, effort, and insight.
|
||||
MAINTAINERS:
|
||||
|
||||
Brian Behlendorf <behlendorf1@llnl.gov>
|
||||
Brian Behlendorf <behlendorf1@llnl.gov>
|
||||
Tony Hutter <hutter2@llnl.gov>
|
||||
|
||||
First and foremost the hard working ZFS developers at Sun/Oracle.
|
||||
They are responsible for the bulk of the code in this project and
|
||||
without their efforts there never would have been a ZFS filesystem.
|
||||
PAST MAINTAINERS:
|
||||
|
||||
The ZFS Development Team at Sun/Oracle
|
||||
Ned Bass <bass6@llnl.gov>
|
||||
|
||||
Next all the developers at KQ Infotech who implemented a prototype
|
||||
ZFS Posix Layer (ZPL). Their implementation provided an excellent
|
||||
reference for adding the ZPL functionality.
|
||||
CONTRIBUTORS:
|
||||
|
||||
Anand Mitra <mitra@kqinfotech.com>
|
||||
Anurag Agarwal <anurag@kqinfotech.com>
|
||||
Neependra Khare <neependra@kqinfotech.com>
|
||||
Prasad Joshi <prasad@kqinfotech.com>
|
||||
Rohan Puri <rohan@kqinfotech.com>
|
||||
Sandip Divekar <sandipd@kqinfotech.com>
|
||||
Shoaib <shoaib@kqinfotech.com>
|
||||
Shrirang <shrirang@kqinfotech.com>
|
||||
|
||||
Additionally the following individuals have all made contributions
|
||||
to the project and deserve to be acknowledged.
|
||||
|
||||
Albert Lee <trisk@nexenta.com>
|
||||
Alejandro R. Sedeño <asedeno@mit.edu>
|
||||
Alex Zhuravlev <bzzz@whamcloud.com>
|
||||
Alexander Eremin <a.eremin@nexenta.com>
|
||||
Alexander Stetsenko <ams@nexenta.com>
|
||||
Alexey Shvetsov <alexxy@gentoo.org>
|
||||
Andreas Dilger <adilger@whamcloud.com>
|
||||
Andrew Reid <ColdCanuck@nailedtotheperch.com>
|
||||
Andrew Stormont <andrew.stormont@nexenta.com>
|
||||
Andrew Tselischev <andrewtselischev@gmail.com>
|
||||
Andriy Gapon <avg@FreeBSD.org>
|
||||
Aniruddha Shankar <k@191a.net>
|
||||
Bill Pijewski <wdp@joyent.com>
|
||||
Chris Dunlap <cdunlap@llnl.gov>
|
||||
Chris Dunlop <chris@onthe.net.au>
|
||||
Chris Siden <chris.siden@delphix.com>
|
||||
Chris Wedgwood <cw@f00f.org>
|
||||
Christian Kohlschütter <christian@kohlschutter.com>
|
||||
Christopher Siden <chris.siden@delphix.com>
|
||||
Craig Sanders <github@taz.net.au>
|
||||
Cyril Plisko <cyril.plisko@mountall.com>
|
||||
Dan McDonald <danmcd@nexenta.com>
|
||||
Daniel Verite <daniel@verite.pro>
|
||||
Darik Horn <dajhorn@vanadac.com>
|
||||
Eric Schrock <Eric.Schrock@delphix.com>
|
||||
Etienne Dechamps <etienne.dechamps@ovh.net>
|
||||
Fajar A. Nugraha <github@fajar.net>
|
||||
Frederik Wessels <wessels147@gmail.com>
|
||||
Garrett D'Amore <garrett@nexenta.com>
|
||||
George Wilson <george.wilson@delphix.com>
|
||||
Gordon Ross <gwr@nexenta.com>
|
||||
Gregor Kopka <mailfrom-github.com@kopka.net>
|
||||
Gunnar Beutner <gunnar@beutner.name>
|
||||
James H <james@kagisoft.co.uk>
|
||||
Javen Wu <wu.javen@gmail.com>
|
||||
Jeremy Gill <jgill@parallax-innovations.com>
|
||||
Jorgen Lundman <lundman@lundman.net>
|
||||
KORN Andras <korn@elan.rulez.org>
|
||||
Kyle Fuller <inbox@kylefuller.co.uk>
|
||||
Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
|
||||
Martin Matuska <mm@FreeBSD.org>
|
||||
Massimo Maggi <massimo@mmmm.it>
|
||||
Matthew Ahrens <mahrens@delphix.com>
|
||||
Michael Martin <mgmartin.mgm@gmail.com>
|
||||
Mike Harsch <mike@harschsystems.com>
|
||||
Ned Bass <bass6@llnl.gov>
|
||||
Oleg Stepura <oleg@stepura.com>
|
||||
P.SCH <p88@yahoo.com>
|
||||
Pawel Jakub Dawidek <pawel@dawidek.net>
|
||||
Prakash Surya <surya1@llnl.gov>
|
||||
Prasad Joshi <pjoshi@stec-inc.com>
|
||||
Ricardo M. Correia <Ricardo.M.Correia@Sun.COM>
|
||||
Richard Laager <rlaager@wiktel.com>
|
||||
Richard Lowe <richlowe@richlowe.net>
|
||||
Richard Yao <ryao@cs.stonybrook.edu>
|
||||
Rohan Puri <rohan.puri15@gmail.com>
|
||||
Shampavman <sham.pavman@nexenta.com>
|
||||
Simon Klinkert <klinkert@webgods.de>
|
||||
Suman Chakravartula <suman@gogrid.com>
|
||||
Tim Haley <Tim.Haley@Sun.COM>
|
||||
Turbo Fredriksson <turbo@bayour.com>
|
||||
Xin Li <delphij@FreeBSD.org>
|
||||
Yuxuan Shui <yshuiv7@gmail.com>
|
||||
Zachary Bedell <zac@thebedells.org>
|
||||
nordaux <nordaux@gmail.com>
|
||||
Aaron Fineman <abyxcos@gmail.com>
|
||||
Adam Leventhal <ahl@delphix.com>
|
||||
Adam Stevko <adam.stevko@gmail.com>
|
||||
Ahmed G <ahmedg@delphix.com>
|
||||
Akash Ayare <aayare@delphix.com>
|
||||
Alan Somers <asomers@gmail.com>
|
||||
Alar Aun <spamtoaun@gmail.com>
|
||||
Albert Lee <trisk@nexenta.com>
|
||||
Alec Salazar <alec.j.salazar@gmail.com>
|
||||
Alejandro R. Sedeño <asedeno@mit.edu>
|
||||
Alek Pinchuk <alek@nexenta.com>
|
||||
Alex Braunegg <alex.braunegg@gmail.com>
|
||||
Alex McWhirter <alexmcwhirter@triadic.us>
|
||||
Alex Reece <alex@delphix.com>
|
||||
Alex Wilson <alex.wilson@joyent.com>
|
||||
Alex Zhuravlev <alexey.zhuravlev@intel.com>
|
||||
Alexander Eremin <a.eremin@nexenta.com>
|
||||
Alexander Motin <mav@freebsd.org>
|
||||
Alexander Pyhalov <apyhalov@gmail.com>
|
||||
Alexander Stetsenko <ams@nexenta.com>
|
||||
Alexey Shvetsov <alexxy@gentoo.org>
|
||||
Alexey Smirnoff <fling@member.fsf.org>
|
||||
Allan Jude <allanjude@freebsd.org>
|
||||
AndCycle <andcycle@andcycle.idv.tw>
|
||||
Andreas Buschmann <andreas.buschmann@tech.net.de>
|
||||
Andreas Dilger <adilger@intel.com>
|
||||
Andrew Barnes <barnes333@gmail.com>
|
||||
Andrew Hamilton <ahamilto@tjhsst.edu>
|
||||
Andrew Reid <ColdCanuck@nailedtotheperch.com>
|
||||
Andrew Stormont <andrew.stormont@nexenta.com>
|
||||
Andrew Tselischev <andrewtselischev@gmail.com>
|
||||
Andrey Vesnovaty <andrey.vesnovaty@gmail.com>
|
||||
Andriy Gapon <avg@freebsd.org>
|
||||
Andy Bakun <github@thwartedefforts.org>
|
||||
Aniruddha Shankar <k@191a.net>
|
||||
Antonio Russo <antonio.e.russo@gmail.com>
|
||||
Arkadiusz Bubała <arkadiusz.bubala@open-e.com>
|
||||
Arne Jansen <arne@die-jansens.de>
|
||||
Aron Xu <happyaron.xu@gmail.com>
|
||||
Bart Coddens <bart.coddens@gmail.com>
|
||||
Basil Crow <basil.crow@delphix.com>
|
||||
Huang Liu <liu.huang@zte.com.cn>
|
||||
Ben Allen <bsallen@alcf.anl.gov>
|
||||
Ben Rubson <ben.rubson@gmail.com>
|
||||
Benjamin Albrecht <git@albrecht.io>
|
||||
Bill McGonigle <bill-github.com-public1@bfccomputing.com>
|
||||
Bill Pijewski <wdp@joyent.com>
|
||||
Boris Protopopov <boris.protopopov@nexenta.com>
|
||||
Brad Lewis <brad.lewis@delphix.com>
|
||||
Brian Behlendorf <behlendorf1@llnl.gov>
|
||||
Brian J. Murrell <brian@sun.com>
|
||||
Caleb James DeLisle <calebdelisle@lavabit.com>
|
||||
Cao Xuewen <cao.xuewen@zte.com.cn>
|
||||
Carlo Landmeter <clandmeter@gmail.com>
|
||||
Carlos Alberto Lopez Perez <clopez@igalia.com>
|
||||
Chaoyu Zhang <zhang.chaoyu@zte.com.cn>
|
||||
Chen Can <chen.can2@zte.com.cn>
|
||||
Chen Haiquan <oc@yunify.com>
|
||||
Chip Parker <aparker@enthought.com>
|
||||
Chris Burroughs <chris.burroughs@gmail.com>
|
||||
Chris Dunlap <cdunlap@llnl.gov>
|
||||
Chris Dunlop <chris@onthe.net.au>
|
||||
Chris Siden <chris.siden@delphix.com>
|
||||
Chris Wedgwood <cw@f00f.org>
|
||||
Chris Williamson <chris.williamson@delphix.com>
|
||||
Chris Zubrzycki <github@mid-earth.net>
|
||||
Christ Schlacta <aarcane@aarcane.info>
|
||||
Christer Ekholm <che@chrekh.se>
|
||||
Christian Kohlschütter <christian@kohlschutter.com>
|
||||
Christian Neukirchen <chneukirchen@gmail.com>
|
||||
Christian Schwarz <me@cschwarz.com>
|
||||
Christopher Voltz <cjunk@voltz.ws>
|
||||
Chunwei Chen <david.chen@nutanix.com>
|
||||
Clemens Fruhwirth <clemens@endorphin.org>
|
||||
Colin Ian King <colin.king@canonical.com>
|
||||
Craig Loomis <cloomis@astro.princeton.edu>
|
||||
Craig Sanders <github@taz.net.au>
|
||||
Cyril Plisko <cyril.plisko@infinidat.com>
|
||||
DHE <git@dehacked.net>
|
||||
Damian Wojsław <damian@wojslaw.pl>
|
||||
Dan Kimmel <dan.kimmel@delphix.com>
|
||||
Dan McDonald <danmcd@nexenta.com>
|
||||
Dan Swartzendruber <dswartz@druber.com>
|
||||
Dan Vatca <dan.vatca@gmail.com>
|
||||
Daniel Hoffman <dj.hoffman@delphix.com>
|
||||
Daniel Verite <daniel@verite.pro>
|
||||
Daniil Lunev <d.lunev.mail@gmail.com>
|
||||
Darik Horn <dajhorn@vanadac.com>
|
||||
Dave Eddy <dave@daveeddy.com>
|
||||
David Lamparter <equinox@diac24.net>
|
||||
David Qian <david.qian@intel.com>
|
||||
David Quigley <david.quigley@intel.com>
|
||||
Debabrata Banerjee <dbanerje@akamai.com>
|
||||
Denys Rtveliashvili <denys@rtveliashvili.name>
|
||||
Derek Dai <daiderek@gmail.com>
|
||||
Dimitri John Ledkov <xnox@ubuntu.com>
|
||||
Dmitry Khasanov <pik4ez@gmail.com>
|
||||
Dominik Hassler <hadfl@omniosce.org>
|
||||
Dominik Honnef <dominikh@fork-bomb.org>
|
||||
Don Brady <don.brady@delphix.com>
|
||||
Dr. András Korn <korn-github.com@elan.rulez.org>
|
||||
Eli Rosenthal <eli.rosenthal@delphix.com>
|
||||
Eric Desrochers <eric.desrochers@canonical.com>
|
||||
Eric Dillmann <eric@jave.fr>
|
||||
Eric Schrock <Eric.Schrock@delphix.com>
|
||||
Etienne Dechamps <etienne@edechamps.fr>
|
||||
Evan Susarret <evansus@gmail.com>
|
||||
Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||||
Fajar A. Nugraha <github@fajar.net>
|
||||
Fan Yong <fan.yong@intel.com>
|
||||
Feng Sun <loyou85@gmail.com>
|
||||
Frederik Wessels <wessels147@gmail.com>
|
||||
Frédéric Vanniere <f.vanniere@planet-work.com>
|
||||
Garrett D'Amore <garrett@nexenta.com>
|
||||
Garrison Jensen <garrison.jensen@gmail.com>
|
||||
Gary Mills <gary_mills@fastmail.fm>
|
||||
Gaurav Kumar <gauravk.18@gmail.com>
|
||||
GeLiXin <ge.lixin@zte.com.cn>
|
||||
George Amanakis <g_amanakis@yahoo.com>
|
||||
George Melikov <mail@gmelikov.ru>
|
||||
George Wilson <gwilson@delphix.com>
|
||||
Georgy Yakovlev <ya@sysdump.net>
|
||||
Giuseppe Di Natale <guss80@gmail.com>
|
||||
Gordan Bobic <gordan@redsleeve.org>
|
||||
Gordon Ross <gwr@nexenta.com>
|
||||
Gregor Kopka <gregor@kopka.net>
|
||||
Grischa Zengel <github.zfsonlinux@zengel.info>
|
||||
Gunnar Beutner <gunnar@beutner.name>
|
||||
Gvozden Neskovic <neskovic@gmail.com>
|
||||
Hajo Möller <dasjoe@gmail.com>
|
||||
Hans Rosenfeld <hans.rosenfeld@nexenta.com>
|
||||
Håkan Johansson <f96hajo@chalmers.se>
|
||||
Igor Kozhukhov <ikozhukhov@gmail.com>
|
||||
Igor Lvovsky <ilvovsky@gmail.com>
|
||||
Isaac Huang <he.huang@intel.com>
|
||||
JK Dingwall <james@dingwall.me.uk>
|
||||
Jacek Fefliński <feflik@gmail.com>
|
||||
James Cowgill <james.cowgill@mips.com>
|
||||
James Lee <jlee@thestaticvoid.com>
|
||||
James Pan <jiaming.pan@yahoo.com>
|
||||
Jan Engelhardt <jengelh@inai.de>
|
||||
Jan Kryl <jan.kryl@nexenta.com>
|
||||
Jan Sanislo <oystr@cs.washington.edu>
|
||||
Jason King <jason.brian.king@gmail.com>
|
||||
Jason Zaman <jasonzaman@gmail.com>
|
||||
Javen Wu <wu.javen@gmail.com>
|
||||
Jeremy Gill <jgill@parallax-innovations.com>
|
||||
Jeremy Jones <jeremy@delphix.com>
|
||||
Jerry Jelinek <jerry.jelinek@joyent.com>
|
||||
Jinshan Xiong <jinshan.xiong@intel.com>
|
||||
Joe Stein <joe.stein@delphix.com>
|
||||
John Albietz <inthecloud247@gmail.com>
|
||||
John Eismeier <john.eismeier@gmail.com>
|
||||
John L. Hammond <john.hammond@intel.com>
|
||||
John Layman <jlayman@sagecloud.com>
|
||||
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
|
||||
John Wren Kennedy <john.kennedy@delphix.com>
|
||||
Johnny Stenback <github@jstenback.com>
|
||||
Jorgen Lundman <lundman@lundman.net>
|
||||
Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
|
||||
Joshua M. Clulow <josh@sysmgr.org>
|
||||
Justin Bedő <cu@cua0.org>
|
||||
Justin Lecher <jlec@gentoo.org>
|
||||
Justin T. Gibbs <gibbs@FreeBSD.org>
|
||||
Jörg Thalheim <joerg@higgsboson.tk>
|
||||
KORN Andras <korn@elan.rulez.org>
|
||||
Kamil Domański <kamil@domanski.co>
|
||||
Karsten Kretschmer <kkretschmer@gmail.com>
|
||||
Kash Pande <kash@tripleback.net>
|
||||
Keith M Wesolowski <wesolows@foobazco.org>
|
||||
Kevin Tanguy <kevin.tanguy@ovh.net>
|
||||
KireinaHoro <i@jsteward.moe>
|
||||
Kohsuke Kawaguchi <kk@kohsuke.org>
|
||||
Kyle Blatter <kyleblatter@llnl.gov>
|
||||
Kyle Fuller <inbox@kylefuller.co.uk>
|
||||
Loli <ezomori.nozomu@gmail.com>
|
||||
Lars Johannsen <laj@it.dk>
|
||||
Li Dongyang <dongyang.li@anu.edu.au>
|
||||
Li Wei <W.Li@Sun.COM>
|
||||
Lukas Wunner <lukas@wunner.de>
|
||||
Madhav Suresh <madhav.suresh@delphix.com>
|
||||
Manoj Joseph <manoj.joseph@delphix.com>
|
||||
Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
|
||||
Marcel Huber <marcelhuberfoo@gmail.com>
|
||||
Marcel Telka <marcel.telka@nexenta.com>
|
||||
Marcel Wysocki <maci.stgn@gmail.com>
|
||||
Mark Shellenbaum <Mark.Shellenbaum@Oracle.COM>
|
||||
Mark Wright <markwright@internode.on.net>
|
||||
Martin Matuska <mm@FreeBSD.org>
|
||||
Massimo Maggi <me@massimo-maggi.eu>
|
||||
Matt Johnston <matt@fugro-fsi.com.au>
|
||||
Matt Kemp <matt@mattikus.com>
|
||||
Matthew Ahrens <matt@delphix.com>
|
||||
Matthew Thode <mthode@mthode.org>
|
||||
Matus Kral <matuskral@me.com>
|
||||
Max Grossman <max.grossman@delphix.com>
|
||||
Maximilian Mehnert <maximilian.mehnert@gmx.de>
|
||||
Michael Gebetsroither <michael@mgeb.org>
|
||||
Michael Kjorling <michael@kjorling.se>
|
||||
Michael Martin <mgmartin.mgm@gmail.com>
|
||||
Mike Gerdts <mike.gerdts@joyent.com>
|
||||
Mike Harsch <mike@harschsystems.com>
|
||||
Mike Leddy <mike.leddy@gmail.com>
|
||||
Mike Swanson <mikeonthecomputer@gmail.com>
|
||||
Milan Jurik <milan.jurik@xylab.cz>
|
||||
Morgan Jones <mjones@rice.edu>
|
||||
Moritz Maxeiner <moritz@ucworks.org>
|
||||
Nathaniel Clark <Nathaniel.Clark@misrule.us>
|
||||
Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
|
||||
Nav Ravindranath <nav@delphix.com>
|
||||
Neal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
|
||||
Ned Bass <bass6@llnl.gov>
|
||||
Neependra Khare <neependra@kqinfotech.com>
|
||||
Neil Stockbridge <neil@dist.ro>
|
||||
Nick Garvey <garvey.nick@gmail.com>
|
||||
Nikolay Borisov <n.borisov.lkml@gmail.com>
|
||||
Olaf Faaland <faaland1@llnl.gov>
|
||||
Oleg Drokin <green@linuxhacker.ru>
|
||||
Oleg Stepura <oleg@stepura.com>
|
||||
Patrik Greco <sikevux@sikevux.se>
|
||||
Paul B. Henson <henson@acm.org>
|
||||
Paul Dagnelie <pcd@delphix.com>
|
||||
Paul Zuchowski <pzuchowski@datto.com>
|
||||
Pavel Boldin <boldin.pavel@gmail.com>
|
||||
Pavel Zakharov <pavel.zakharov@delphix.com>
|
||||
Pawel Jakub Dawidek <pjd@FreeBSD.org>
|
||||
Pedro Giffuni <pfg@freebsd.org>
|
||||
Peng <peng.hse@xtaotech.com>
|
||||
Peter Ashford <ashford@accs.com>
|
||||
Prakash Surya <prakash.surya@delphix.com>
|
||||
Prasad Joshi <prasadjoshi124@gmail.com>
|
||||
Ralf Ertzinger <ralf@skytale.net>
|
||||
Randall Mason <ClashTheBunny@gmail.com>
|
||||
Remy Blank <remy.blank@pobox.com>
|
||||
Ricardo M. Correia <ricardo.correia@oracle.com>
|
||||
Rich Ercolani <rincebrain@gmail.com>
|
||||
Richard Elling <Richard.Elling@RichardElling.com>
|
||||
Richard Laager <rlaager@wiktel.com>
|
||||
Richard Lowe <richlowe@richlowe.net>
|
||||
Richard Sharpe <rsharpe@samba.org>
|
||||
Richard Yao <ryao@gentoo.org>
|
||||
Rohan Puri <rohan.puri15@gmail.com>
|
||||
Romain Dolbeau <romain.dolbeau@atos.net>
|
||||
Roman Strashkin <roman.strashkin@nexenta.com>
|
||||
Ruben Kerkhof <ruben@rubenkerkhof.com>
|
||||
Saso Kiselkov <saso.kiselkov@nexenta.com>
|
||||
Scot W. Stevenson <scot.stevenson@gmail.com>
|
||||
Sean Eric Fagan <sef@ixsystems.com>
|
||||
Sen Haerens <sen@senhaerens.be>
|
||||
Serapheim Dimitropoulos <serapheim@delphix.com>
|
||||
Seth Forshee <seth.forshee@canonical.com>
|
||||
Shampavman <sham.pavman@nexenta.com>
|
||||
Shen Yan <shenyanxxxy@qq.com>
|
||||
Simon Guest <simon.guest@tesujimath.org>
|
||||
Simon Klinkert <simon.klinkert@gmail.com>
|
||||
Sowrabha Gopal <sowrabha.gopal@delphix.com>
|
||||
Stanislav Seletskiy <s.seletskiy@gmail.com>
|
||||
Steffen Müthing <steffen.muething@iwr.uni-heidelberg.de>
|
||||
Stephen Blinick <stephen.blinick@delphix.com>
|
||||
Steve Dougherty <sdougherty@barracuda.com>
|
||||
Steven Burgess <sburgess@dattobackup.com>
|
||||
Steven Hartland <smh@freebsd.org>
|
||||
Steven Johnson <sjohnson@sakuraindustries.com>
|
||||
Stian Ellingsen <stian@plaimi.net>
|
||||
Suman Chakravartula <schakrava@gmail.com>
|
||||
Sydney Vanda <sydney.m.vanda@intel.com>
|
||||
Sören Tempel <soeren+git@soeren-tempel.net>
|
||||
Thijs Cramer <thijs.cramer@gmail.com>
|
||||
Tim Chase <tim@chase2k.com>
|
||||
Tim Connors <tconnors@rather.puzzling.org>
|
||||
Tim Crawford <tcrawford@datto.com>
|
||||
Tim Haley <Tim.Haley@Sun.COM>
|
||||
Tobin Harding <me@tobin.cc>
|
||||
Tom Caputi <tcaputi@datto.com>
|
||||
Tom Matthews <tom@axiom-partners.com>
|
||||
Tom Prince <tom.prince@ualberta.net>
|
||||
Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
|
||||
Tony Hutter <hutter2@llnl.gov>
|
||||
Toomas Soome <tsoome@me.com>
|
||||
Trey Dockendorf <treydock@gmail.com>
|
||||
Turbo Fredriksson <turbo@bayour.com>
|
||||
Tyler J. Stachecki <stachecki.tyler@gmail.com>
|
||||
Vitaut Bajaryn <vitaut.bayaryn@gmail.com>
|
||||
Weigang Li <weigang.li@intel.com>
|
||||
Will Andrews <will@freebsd.org>
|
||||
Will Rouesnel <w.rouesnel@gmail.com>
|
||||
Wolfgang Bumiller <w.bumiller@proxmox.com>
|
||||
Xin Li <delphij@FreeBSD.org>
|
||||
Ying Zhu <casualfisher@gmail.com>
|
||||
YunQiang Su <syq@debian.org>
|
||||
Yuri Pankov <yuri.pankov@gmail.com>
|
||||
Yuxuan Shui <yshuiv7@gmail.com>
|
||||
Zachary Bedell <zac@thebedells.org>
|
||||
|
|
|
|||
46
COPYRIGHT
46
COPYRIGHT
|
|
@ -1,39 +1,27 @@
|
|||
The majority of the code in the ZFS on Linux port comes from OpenSolaris
|
||||
which has been released under the terms of the CDDL open source license.
|
||||
This includes the core ZFS code, libavl, libnvpair, libefi, libunicode,
|
||||
and libutil. The original OpenSolaris source can be downloaded from:
|
||||
Refer to the git commit log for authoritative copyright attribution.
|
||||
|
||||
http://dlc.sun.com/osol/on/downloads/b121/on-src.tar.bz2
|
||||
The original ZFS source code was obtained from Open Solaris which was
|
||||
released under the terms of the CDDL open source license. Additional
|
||||
changes have been included from OpenZFS and the Illumos project which
|
||||
are similarly licensed. These projects can be found on Github at:
|
||||
|
||||
Files which do not originate from OpenSolaris are noted in the file header
|
||||
and attributed properly. These exceptions include, but are not limited
|
||||
to, the vdev_disk.c and zvol.c implementation which are licensed under
|
||||
the CDDL.
|
||||
|
||||
The latest stable and development versions of this port can be downloaded
|
||||
from the official ZFS on Linux site located at:
|
||||
|
||||
http://zfsonlinux.org/
|
||||
|
||||
This ZFS on Linux port was produced at the Lawrence Livermore National
|
||||
Laboratory (LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44)
|
||||
between the U.S. Department of Energy (DOE) and Lawrence Livermore
|
||||
National Security, LLC (LLNS) for the operation of LLNL. It has been
|
||||
approved for release under LLNL-CODE-403049.
|
||||
* https://github.com/illumos/illumos-gate
|
||||
* https://github.com/openzfs/openzfs
|
||||
|
||||
Unless otherwise noted, all files in this distribution are released
|
||||
under the Common Development and Distribution License (CDDL).
|
||||
Exceptions are noted within the associated source files. A few notable
|
||||
exceptions and their respective licenses include:
|
||||
|
||||
Skein Checksum Implementation: module/icp/algs/skein/THIRDPARTYLICENSE
|
||||
AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
|
||||
AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
|
||||
PBKDF2 Implementation: lib/libzfs/THIRDPARTYLICENSE.openssl
|
||||
Exceptions are noted within the associated source files headers and
|
||||
by including a THIRDPARTYLICENSE file with the license terms. A few
|
||||
notable exceptions and their respective licenses include:
|
||||
|
||||
* Skein Checksum Implementation: module/icp/algs/skein/THIRDPARTYLICENSE
|
||||
* AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
|
||||
* AES Implementation: module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
|
||||
* PBKDF2 Implementation: lib/libzfs/THIRDPARTYLICENSE.openssl
|
||||
* SPL Implementation: module/spl/THIRDPARTYLICENSE.gplv2
|
||||
|
||||
This product includes software developed by the OpenSSL Project for use
|
||||
in the OpenSSL Toolkit (http://www.openssl.org/)
|
||||
|
||||
See the file OPENSOLARIS.LICENSE for more information.
|
||||
|
||||
Refer to the git commit log for authoritative copyright attribution.
|
||||
See the LICENSE and NOTICE for more information.
|
||||
|
|
|
|||
24
DISCLAIMER
24
DISCLAIMER
|
|
@ -1,24 +0,0 @@
|
|||
This work was produced at the Lawrence Livermore National Laboratory
|
||||
(LLNL) under Contract No. DE-AC52-07NA27344 (Contract 44) between
|
||||
the U.S. Department of Energy (DOE) and Lawrence Livermore National
|
||||
Security, LLC (LLNS) for the operation of LLNL.
|
||||
|
||||
This work was prepared as an account of work sponsored by an agency of
|
||||
the United States Government. Neither the United States Government nor
|
||||
Lawrence Livermore National Security, LLC nor any of their employees,
|
||||
makes any warranty, express or implied, or assumes any liability or
|
||||
responsibility for the accuracy, completeness, or usefulness of any
|
||||
information, apparatus, product, or process disclosed, or represents
|
||||
that its use would not infringe privately-owned rights.
|
||||
|
||||
Reference herein to any specific commercial products, process, or
|
||||
services by trade name, trademark, manufacturer or otherwise does
|
||||
not necessarily constitute or imply its endorsement, recommendation,
|
||||
or favoring by the United States Government or Lawrence Livermore
|
||||
National Security, LLC. The views and opinions of authors expressed
|
||||
herein do not necessarily state or reflect those of the United States
|
||||
Government or Lawrence Livermore National Security, LLC, and shall
|
||||
not be used for advertising or product endorsement purposes.
|
||||
|
||||
The precise terms and conditions for copying, distribution, and
|
||||
modification are specified in the file OPENSOLARIS.LICENSE.
|
||||
22
Makefile.am
22
Makefile.am
|
|
@ -11,17 +11,17 @@ endif
|
|||
if CONFIG_KERNEL
|
||||
SUBDIRS += module
|
||||
|
||||
extradir = @prefix@/src/zfs-$(VERSION)
|
||||
extradir = $(prefix)/src/zfs-$(VERSION)
|
||||
extra_HEADERS = zfs.release.in zfs_config.h.in
|
||||
|
||||
kerneldir = @prefix@/src/zfs-$(VERSION)/$(LINUX_VERSION)
|
||||
kerneldir = $(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION)
|
||||
nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
|
||||
endif
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
EXTRA_DIST = autogen.sh copy-builtin
|
||||
EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
|
||||
EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE
|
||||
EXTRA_DIST += META AUTHORS COPYRIGHT LICENSE NOTICE README.md
|
||||
|
||||
@CODE_COVERAGE_RULES@
|
||||
|
||||
|
|
@ -44,6 +44,22 @@ dist-hook:
|
|||
sed -i 's/Release:[[:print:]]*/Release: $(RELEASE)/' \
|
||||
$(distdir)/META
|
||||
|
||||
# For compatibility, create a matching spl-x.y.z directly which contains
|
||||
# symlinks to the updated header and object file locations. These
|
||||
# compatibility links will be removed in the next major release.
|
||||
if CONFIG_KERNEL
|
||||
install-data-hook:
|
||||
mkdir $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \
|
||||
cd $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \
|
||||
ln -s ../zfs-$(VERSION)/include/spl include && \
|
||||
ln -s ../zfs-$(VERSION)/$(LINUX_VERSION) $(LINUX_VERSION) && \
|
||||
ln -s ../zfs-$(VERSION)/zfs_config.h.in spl_config.h.in && \
|
||||
ln -s ../zfs-$(VERSION)/zfs.release.in spl.release.in && \
|
||||
cd $(DESTDIR)$(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION) && \
|
||||
ln -s zfs_config.h spl_config.h && \
|
||||
ln -s zfs.release spl.release
|
||||
endif
|
||||
|
||||
checkstyle: cstyle shellcheck flake8 commitcheck mancheck testscheck
|
||||
|
||||
commitcheck:
|
||||
|
|
|
|||
16
NOTICE
Normal file
16
NOTICE
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
This work was produced under the auspices of the U.S. Department of Energy by
|
||||
Lawrence Livermore National Laboratory under Contract DE-AC52-07NA27344.
|
||||
|
||||
This work was prepared as an account of work sponsored by an agency of the
|
||||
United States Government. Neither the United States Government nor Lawrence
|
||||
Livermore National Security, LLC, nor any of their employees makes any warranty,
|
||||
expressed or implied, or assumes any legal liability or responsibility for the
|
||||
accuracy, completeness, or usefulness of any information, apparatus, product, or
|
||||
process disclosed, or represents that its use would not infringe privately owned
|
||||
rights. Reference herein to any specific commercial product, process, or service
|
||||
by trade name, trademark, manufacturer, or otherwise does not necessarily
|
||||
constitute or imply its endorsement, recommendation, or favoring by the United
|
||||
States Government or Lawrence Livermore National Security, LLC. The views and
|
||||
opinions of authors expressed herein do not necessarily state or reflect those
|
||||
of the United States Government or Lawrence Livermore National Security, LLC,
|
||||
and shall not be used for advertising or product endorsement purposes.
|
||||
|
|
@ -7,14 +7,22 @@ developed for Solaris and is now maintained by the OpenZFS community.
|
|||
[](https://scan.coverity.com/projects/zfsonlinux-zfs)
|
||||
|
||||
# Official Resources
|
||||
|
||||
* [Site](http://zfsonlinux.org)
|
||||
* [Wiki](https://github.com/zfsonlinux/zfs/wiki)
|
||||
* [Mailing lists](https://github.com/zfsonlinux/zfs/wiki/Mailing-Lists)
|
||||
* [OpenZFS site](http://open-zfs.org/)
|
||||
|
||||
# Installation
|
||||
|
||||
Full documentation for installing ZoL on your favorite Linux distribution can
|
||||
be found at [our site](http://zfsonlinux.org/).
|
||||
|
||||
# Contribute & Develop
|
||||
|
||||
We have a separate document with [contribution guidelines](./.github/CONTRIBUTING.md).
|
||||
|
||||
# Release
|
||||
|
||||
ZFS on Linux is released under a CDDL license.
|
||||
For more details see the NOTICE, LICENSE and COPYRIGHT files; `UCRL-CODE-235197`
|
||||
4
TEST
4
TEST
|
|
@ -4,10 +4,6 @@
|
|||
#TEST_PREPARE_WATCHDOG="yes"
|
||||
#TEST_PREPARE_SHARES="yes"
|
||||
|
||||
### SPLAT
|
||||
#TEST_SPLAT_SKIP="yes"
|
||||
#TEST_SPLAT_OPTIONS="-acvx"
|
||||
|
||||
### ztest
|
||||
#TEST_ZTEST_SKIP="yes"
|
||||
#TEST_ZTEST_TIMEOUT=1800
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
#include <locale.h>
|
||||
#include <getopt.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
|
||||
#define ZS_COMMENT 0x00000000 /* comment */
|
||||
#define ZS_ZFSUTIL 0x00000001 /* caller is zfs(8) */
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <libuutil.h>
|
||||
#include <libzfs.h>
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@
|
|||
#include <thread_pool.h>
|
||||
#include <pthread.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include "zfs_agents.h"
|
||||
#include "../zed_log.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
|
||||
#include <libzfs.h>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ dnl #
|
|||
dnl # 2.6.33 API change,
|
||||
dnl # Removed .ctl_name from struct ctl_table.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_CTL_NAME], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_CTL_NAME], [
|
||||
AC_MSG_CHECKING([whether struct ctl_table has ctl_name])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/sysctl.h>
|
||||
],[
|
||||
struct ctl_table ctl __attribute__ ((unused));
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
dnl #
|
||||
dnl # PaX Linux 2.6.38 - 3.x API
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_PAX_KERNEL_FILE_FALLOCATE], [
|
||||
AC_DEFUN([ZFS_AC_PAX_KERNEL_FILE_FALLOCATE], [
|
||||
AC_MSG_CHECKING([whether fops->fallocate() exists])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/fs.h>
|
||||
],[
|
||||
long (*fallocate) (struct file *, int, loff_t, loff_t) = NULL;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ dnl #
|
|||
dnl # 4.9 API change
|
||||
dnl # group_info changed from 2d array via >blocks to 1d array via ->gid
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_GROUP_INFO_GID], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_GROUP_INFO_GID], [
|
||||
AC_MSG_CHECKING([whether group_info->gid exists])
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/cred.h>
|
||||
],[
|
||||
struct group_info *gi = groups_alloc(1);
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ dnl # i_mutex is changed to i_rwsem. Instead of directly using
|
|||
dnl # i_mutex/i_rwsem, we should use inode_lock() and inode_lock_shared()
|
||||
dnl # We test inode_lock_shared because inode_lock is introduced earlier.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_INODE_LOCK], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_INODE_LOCK], [
|
||||
AC_MSG_CHECKING([whether inode_lock_shared() exists])
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/fs.h>
|
||||
],[
|
||||
struct inode *inode = NULL;
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ dnl # private allocation flags which are applied when allocating a new slab
|
|||
dnl # in kmem_getpages(). Unfortunately there is no public API for setting
|
||||
dnl # non-default flags.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_KMEM_CACHE_ALLOCFLAGS], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_KMEM_CACHE_ALLOCFLAGS], [
|
||||
AC_MSG_CHECKING([whether struct kmem_cache has allocflags])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/slab.h>
|
||||
],[
|
||||
struct kmem_cache cachep __attribute__ ((unused));
|
||||
|
|
@ -20,7 +20,7 @@ AC_DEFUN([SPL_AC_KMEM_CACHE_ALLOCFLAGS], [
|
|||
AC_MSG_RESULT(no)
|
||||
|
||||
AC_MSG_CHECKING([whether struct kmem_cache has gfpflags])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/slab.h>
|
||||
],[
|
||||
struct kmem_cache cachep __attribute__ ((unused));
|
||||
|
|
@ -40,11 +40,11 @@ dnl # grsecurity API change,
|
|||
dnl # kmem_cache_create() with SLAB_USERCOPY flag replaced by
|
||||
dnl # kmem_cache_create_usercopy().
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_KMEM_CACHE_CREATE_USERCOPY], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_KMEM_CACHE_CREATE_USERCOPY], [
|
||||
AC_MSG_CHECKING([whether kmem_cache_create_usercopy() exists])
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/slab.h>
|
||||
static void ctor(void *foo)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,19 +3,19 @@ dnl # User namespaces, use kuid_t in place of uid_t
|
|||
dnl # where available. Not strictly a user namespaces thing
|
||||
dnl # but it should prevent surprises
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_KUIDGID_T], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_KUIDGID_T], [
|
||||
AC_MSG_CHECKING([whether kuid_t/kgid_t is available])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/uidgid.h>
|
||||
], [
|
||||
kuid_t userid = KUIDT_INIT(0);
|
||||
kgid_t groupid = KGIDT_INIT(0);
|
||||
kuid_t userid __attribute__ ((unused)) = KUIDT_INIT(0);
|
||||
kgid_t groupid __attribute__ ((unused)) = KGIDT_INIT(0);
|
||||
],[
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/uidgid.h>
|
||||
], [
|
||||
kuid_t userid = 0;
|
||||
kgid_t groupid = 0;
|
||||
kuid_t userid __attribute__ ((unused)) = 0;
|
||||
kgid_t groupid __attribute__ ((unused)) = 0;
|
||||
],[
|
||||
AC_MSG_RESULT(yes; optional)
|
||||
],[
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ dnl #
|
|||
dnl # 3.10 API change,
|
||||
dnl # PDE is replaced by PDE_DATA
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_PDE_DATA], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_PDE_DATA], [
|
||||
AC_MSG_CHECKING([whether PDE_DATA() is available])
|
||||
SPL_LINUX_TRY_COMPILE_SYMBOL([
|
||||
ZFS_LINUX_TRY_COMPILE_SYMBOL([
|
||||
#include <linux/proc_fs.h>
|
||||
], [
|
||||
PDE_DATA(NULL);
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ dnl # 4.14 API change
|
|||
dnl # kernel_write() which was introduced in 3.9 was updated to take
|
||||
dnl # the offset as a pointer which is needed by vn_rdwr().
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_KERNEL_WRITE], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_WRITE], [
|
||||
AC_MSG_CHECKING([whether kernel_write() takes loff_t pointer])
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/fs.h>
|
||||
],[
|
||||
struct file *file = NULL;
|
||||
|
|
@ -32,11 +32,11 @@ dnl # 4.14 API change
|
|||
dnl # kernel_read() which has existed for forever was updated to take
|
||||
dnl # the offset as a pointer which is needed by vn_rdwr().
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_KERNEL_READ], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_READ], [
|
||||
AC_MSG_CHECKING([whether kernel_read() takes loff_t pointer])
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/fs.h>
|
||||
],[
|
||||
struct file *file = NULL;
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ dnl #
|
|||
dnl # The rw_semaphore.wait_lock member was changed from spinlock_t to
|
||||
dnl # raw_spinlock_t at commit ddb6c9b58a19edcfac93ac670b066c836ff729f1.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_RWSEM_SPINLOCK_IS_RAW], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_RWSEM_SPINLOCK_IS_RAW], [
|
||||
AC_MSG_CHECKING([whether struct rw_semaphore member wait_lock is raw])
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/rwsem.h>
|
||||
],[
|
||||
struct rw_semaphore dummy_semaphore __attribute__ ((unused));
|
||||
|
|
@ -30,11 +30,11 @@ dnl # 3.16 API Change
|
|||
dnl #
|
||||
dnl # rwsem-spinlock "->activity" changed to "->count"
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_RWSEM_ACTIVITY], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_RWSEM_ACTIVITY], [
|
||||
AC_MSG_CHECKING([whether struct rw_semaphore has member activity])
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/rwsem.h>
|
||||
],[
|
||||
struct rw_semaphore dummy_semaphore __attribute__ ((unused));
|
||||
|
|
@ -54,12 +54,12 @@ dnl # 4.8 API Change
|
|||
dnl #
|
||||
dnl # rwsem "->count" changed to atomic_long_t type
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_RWSEM_ATOMIC_LONG_COUNT], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_RWSEM_ATOMIC_LONG_COUNT], [
|
||||
AC_MSG_CHECKING(
|
||||
[whether struct rw_semaphore has atomic_long_t member count])
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/rwsem.h>
|
||||
],[
|
||||
DECLARE_RWSEM(dummy_semaphore);
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ dnl #
|
|||
dnl # 3.9 API change,
|
||||
dnl # Moved things from linux/sched.h to linux/sched/rt.h
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_SCHED_RT_HEADER],
|
||||
AC_DEFUN([ZFS_AC_KERNEL_SCHED_RT_HEADER],
|
||||
[AC_MSG_CHECKING([whether header linux/sched/rt.h exists])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/sched.h>
|
||||
#include <linux/sched/rt.h>
|
||||
],[
|
||||
|
|
@ -21,9 +21,9 @@ dnl #
|
|||
dnl # 4.11 API change,
|
||||
dnl # Moved things from linux/sched.h to linux/sched/signal.h
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_SCHED_SIGNAL_HEADER],
|
||||
AC_DEFUN([ZFS_AC_KERNEL_SCHED_SIGNAL_HEADER],
|
||||
[AC_MSG_CHECKING([whether header linux/sched/signal.h exists])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/sched.h>
|
||||
#include <linux/sched/signal.h>
|
||||
],[
|
||||
|
|
@ -41,9 +41,9 @@ dnl # The io_schedule_timeout() function is present in all 2.6.32 kernels
|
|||
dnl # but it was not exported until Linux 3.19. The RHEL 7.x kernels which
|
||||
dnl # are based on a 3.10 kernel do export this symbol.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_IO_SCHEDULE_TIMEOUT], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_IO_SCHEDULE_TIMEOUT], [
|
||||
AC_MSG_CHECKING([whether io_schedule_timeout() is available])
|
||||
SPL_LINUX_TRY_COMPILE_SYMBOL([
|
||||
ZFS_LINUX_TRY_COMPILE_SYMBOL([
|
||||
#include <linux/sched.h>
|
||||
], [
|
||||
(void) io_schedule_timeout(1);
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ dnl #
|
|||
dnl # 3.9 API change
|
||||
dnl # set_fs_pwd takes const struct path *
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_SET_FS_PWD_WITH_CONST],
|
||||
AC_DEFUN([ZFS_AC_KERNEL_SET_FS_PWD_WITH_CONST],
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
[AC_MSG_CHECKING([whether set_fs_pwd() requires const struct path *])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/fs_struct.h>
|
||||
#include <linux/path.h>
|
||||
|
|
@ -20,7 +20,7 @@ AC_DEFUN([SPL_AC_SET_FS_PWD_WITH_CONST],
|
|||
AC_DEFINE(HAVE_SET_FS_PWD_WITH_CONST, 1,
|
||||
[set_fs_pwd() needs const path *])
|
||||
],[
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/fs_struct.h>
|
||||
#include <linux/path.h>
|
||||
|
|
|
|||
|
|
@ -131,3 +131,130 @@ AC_DEFUN([ZFS_AC_KERNEL_SHRINK_CONTROL_HAS_NID], [
|
|||
AC_MSG_RESULT(no)
|
||||
])
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([ZFS_AC_KERNEL_SHRINKER_CALLBACK],[
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
dnl #
|
||||
dnl # 2.6.23 to 2.6.34 API change
|
||||
dnl # ->shrink(int nr_to_scan, gfp_t gfp_mask)
|
||||
dnl #
|
||||
AC_MSG_CHECKING([whether old 2-argument shrinker exists])
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/mm.h>
|
||||
|
||||
int shrinker_cb(int nr_to_scan, gfp_t gfp_mask);
|
||||
],[
|
||||
struct shrinker cache_shrinker = {
|
||||
.shrink = shrinker_cb,
|
||||
.seeks = DEFAULT_SEEKS,
|
||||
};
|
||||
register_shrinker(&cache_shrinker);
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_2ARGS_OLD_SHRINKER_CALLBACK, 1,
|
||||
[old shrinker callback wants 2 args])
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
dnl #
|
||||
dnl # 2.6.35 - 2.6.39 API change
|
||||
dnl # ->shrink(struct shrinker *,
|
||||
dnl # int nr_to_scan, gfp_t gfp_mask)
|
||||
dnl #
|
||||
AC_MSG_CHECKING([whether old 3-argument shrinker exists])
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/mm.h>
|
||||
|
||||
int shrinker_cb(struct shrinker *, int nr_to_scan,
|
||||
gfp_t gfp_mask);
|
||||
],[
|
||||
struct shrinker cache_shrinker = {
|
||||
.shrink = shrinker_cb,
|
||||
.seeks = DEFAULT_SEEKS,
|
||||
};
|
||||
register_shrinker(&cache_shrinker);
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_3ARGS_SHRINKER_CALLBACK, 1,
|
||||
[old shrinker callback wants 3 args])
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
dnl #
|
||||
dnl # 3.0 - 3.11 API change
|
||||
dnl # ->shrink(struct shrinker *,
|
||||
dnl # struct shrink_control *sc)
|
||||
dnl #
|
||||
AC_MSG_CHECKING(
|
||||
[whether new 2-argument shrinker exists])
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/mm.h>
|
||||
|
||||
int shrinker_cb(struct shrinker *,
|
||||
struct shrink_control *sc);
|
||||
],[
|
||||
struct shrinker cache_shrinker = {
|
||||
.shrink = shrinker_cb,
|
||||
.seeks = DEFAULT_SEEKS,
|
||||
};
|
||||
register_shrinker(&cache_shrinker);
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_2ARGS_NEW_SHRINKER_CALLBACK, 1,
|
||||
[new shrinker callback wants 2 args])
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
dnl #
|
||||
dnl # 3.12 API change,
|
||||
dnl # ->shrink() is logically split in to
|
||||
dnl # ->count_objects() and ->scan_objects()
|
||||
dnl #
|
||||
AC_MSG_CHECKING(
|
||||
[whether ->count_objects callback exists])
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/mm.h>
|
||||
|
||||
unsigned long shrinker_cb(
|
||||
struct shrinker *,
|
||||
struct shrink_control *sc);
|
||||
],[
|
||||
struct shrinker cache_shrinker = {
|
||||
.count_objects = shrinker_cb,
|
||||
.scan_objects = shrinker_cb,
|
||||
.seeks = DEFAULT_SEEKS,
|
||||
};
|
||||
register_shrinker(&cache_shrinker);
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_SPLIT_SHRINKER_CALLBACK,
|
||||
1, [->count_objects exists])
|
||||
],[
|
||||
AC_MSG_ERROR(error)
|
||||
])
|
||||
])
|
||||
])
|
||||
])
|
||||
EXTRA_KCFLAGS="$tmp_flags"
|
||||
])
|
||||
|
||||
dnl #
|
||||
dnl # 2.6.39 API change,
|
||||
dnl # Shrinker adjust to use common shrink_control structure.
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_KERNEL_SHRINK_CONTROL_STRUCT], [
|
||||
AC_MSG_CHECKING([whether struct shrink_control exists])
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/mm.h>
|
||||
],[
|
||||
struct shrink_control sc __attribute__ ((unused));
|
||||
|
||||
sc.nr_to_scan = 0;
|
||||
sc.gfp_mask = GFP_KERNEL;
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_SHRINK_CONTROL_STRUCT, 1,
|
||||
[struct shrink_control exists])
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
])
|
||||
|
|
|
|||
|
|
@ -1,125 +0,0 @@
|
|||
AC_DEFUN([SPL_AC_SHRINKER_CALLBACK],[
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
dnl #
|
||||
dnl # 2.6.23 to 2.6.34 API change
|
||||
dnl # ->shrink(int nr_to_scan, gfp_t gfp_mask)
|
||||
dnl #
|
||||
AC_MSG_CHECKING([whether old 2-argument shrinker exists])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
#include <linux/mm.h>
|
||||
|
||||
int shrinker_cb(int nr_to_scan, gfp_t gfp_mask);
|
||||
],[
|
||||
struct shrinker cache_shrinker = {
|
||||
.shrink = shrinker_cb,
|
||||
.seeks = DEFAULT_SEEKS,
|
||||
};
|
||||
register_shrinker(&cache_shrinker);
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_2ARGS_OLD_SHRINKER_CALLBACK, 1,
|
||||
[old shrinker callback wants 2 args])
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
dnl #
|
||||
dnl # 2.6.35 - 2.6.39 API change
|
||||
dnl # ->shrink(struct shrinker *,
|
||||
dnl # int nr_to_scan, gfp_t gfp_mask)
|
||||
dnl #
|
||||
AC_MSG_CHECKING([whether old 3-argument shrinker exists])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
#include <linux/mm.h>
|
||||
|
||||
int shrinker_cb(struct shrinker *, int nr_to_scan,
|
||||
gfp_t gfp_mask);
|
||||
],[
|
||||
struct shrinker cache_shrinker = {
|
||||
.shrink = shrinker_cb,
|
||||
.seeks = DEFAULT_SEEKS,
|
||||
};
|
||||
register_shrinker(&cache_shrinker);
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_3ARGS_SHRINKER_CALLBACK, 1,
|
||||
[old shrinker callback wants 3 args])
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
dnl #
|
||||
dnl # 3.0 - 3.11 API change
|
||||
dnl # ->shrink(struct shrinker *,
|
||||
dnl # struct shrink_control *sc)
|
||||
dnl #
|
||||
AC_MSG_CHECKING(
|
||||
[whether new 2-argument shrinker exists])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
#include <linux/mm.h>
|
||||
|
||||
int shrinker_cb(struct shrinker *,
|
||||
struct shrink_control *sc);
|
||||
],[
|
||||
struct shrinker cache_shrinker = {
|
||||
.shrink = shrinker_cb,
|
||||
.seeks = DEFAULT_SEEKS,
|
||||
};
|
||||
register_shrinker(&cache_shrinker);
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_2ARGS_NEW_SHRINKER_CALLBACK, 1,
|
||||
[new shrinker callback wants 2 args])
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
dnl #
|
||||
dnl # 3.12 API change,
|
||||
dnl # ->shrink() is logically split in to
|
||||
dnl # ->count_objects() and ->scan_objects()
|
||||
dnl #
|
||||
AC_MSG_CHECKING(
|
||||
[whether ->count_objects callback exists])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
#include <linux/mm.h>
|
||||
|
||||
unsigned long shrinker_cb(
|
||||
struct shrinker *,
|
||||
struct shrink_control *sc);
|
||||
],[
|
||||
struct shrinker cache_shrinker = {
|
||||
.count_objects = shrinker_cb,
|
||||
.scan_objects = shrinker_cb,
|
||||
.seeks = DEFAULT_SEEKS,
|
||||
};
|
||||
register_shrinker(&cache_shrinker);
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_SPLIT_SHRINKER_CALLBACK,
|
||||
1, [->count_objects exists])
|
||||
],[
|
||||
AC_MSG_ERROR(error)
|
||||
])
|
||||
])
|
||||
])
|
||||
])
|
||||
EXTRA_KCFLAGS="$tmp_flags"
|
||||
])
|
||||
|
||||
dnl #
|
||||
dnl # 2.6.39 API change,
|
||||
dnl # Shrinker adjust to use common shrink_control structure.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_SHRINK_CONTROL_STRUCT], [
|
||||
AC_MSG_CHECKING([whether struct shrink_control exists])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
#include <linux/mm.h>
|
||||
],[
|
||||
struct shrink_control sc __attribute__ ((unused));
|
||||
|
||||
sc.nr_to_scan = 0;
|
||||
sc.gfp_mask = GFP_KERNEL;
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_SHRINK_CONTROL_STRUCT, 1,
|
||||
[struct shrink_control exists])
|
||||
],[
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
])
|
||||
|
|
@ -3,11 +3,11 @@ dnl # 2.6.36 API change,
|
|||
dnl # The 'struct fs_struct->lock' was changed from a rwlock_t to
|
||||
dnl # a spinlock_t to improve the fastpath performance.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_FS_STRUCT_SPINLOCK], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_FS_STRUCT_SPINLOCK], [
|
||||
AC_MSG_CHECKING([whether struct fs_struct uses spinlock_t])
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/sched.h>
|
||||
#include <linux/fs_struct.h>
|
||||
],[
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ dnl # (older kernels). Also sanity check the from_timer() and timer_setup()
|
|||
dnl # macros are available as well, since they will be used in the same newer
|
||||
dnl # kernels that support the new timer_list.func signature.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST], [
|
||||
AC_MSG_CHECKING([whether timer_list.function gets a timer_list])
|
||||
tmp_flags="$EXTRA_KCFLAGS"
|
||||
EXTRA_KCFLAGS="-Werror"
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/timer.h>
|
||||
void task_expire(struct timer_list *tl) {}
|
||||
],[
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
dnl #
|
||||
dnl # config trim unused symbols,
|
||||
dnl # Verify the kernel has CONFIG_TRIM_UNUSED_KSYMS DISABLED.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_CONFIG_TRIM_UNUSED_KSYMS], [
|
||||
AC_MSG_CHECKING([whether CONFIG_TRIM_UNUSED_KSYM is disabled])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
#if defined(CONFIG_TRIM_UNUSED_KSYMS)
|
||||
#error CONFIG_TRIM_UNUSED_KSYMS not defined
|
||||
#endif
|
||||
],[ ],[
|
||||
AC_MSG_RESULT([yes])
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_ERROR([
|
||||
*** This kernel has unused symbols trimming enabled, please disable.
|
||||
*** Rebuild the kernel with CONFIG_TRIM_UNUSED_KSYMS=n set.])
|
||||
])
|
||||
])
|
||||
|
|
@ -5,9 +5,9 @@ dnl # usleep_range is a finer precision implementation of msleep
|
|||
dnl # designed to be a drop-in replacement for udelay where a precise
|
||||
dnl # sleep / busy-wait is unnecessary.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_USLEEP_RANGE], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_USLEEP_RANGE], [
|
||||
AC_MSG_CHECKING([whether usleep_range() is available])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/delay.h>
|
||||
],[
|
||||
usleep_range(0, 0);
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ dnl #
|
|||
dnl # 2.6.35 API change,
|
||||
dnl # Unused 'struct dentry *' removed from vfs_fsync() prototype.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_2ARGS_VFS_FSYNC], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_2ARGS_VFS_FSYNC], [
|
||||
AC_MSG_CHECKING([whether vfs_fsync() wants 2 args])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/fs.h>
|
||||
],[
|
||||
vfs_fsync(NULL, 0);
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ dnl #
|
|||
dnl # 4.11 API, a528d35e@torvalds/linux
|
||||
dnl # vfs_getattr(const struct path *p, struct kstat *s, u32 m, unsigned int f)
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_4ARGS_VFS_GETATTR], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_4ARGS_VFS_GETATTR], [
|
||||
AC_MSG_CHECKING([whether vfs_getattr() wants 4 args])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/fs.h>
|
||||
],[
|
||||
vfs_getattr((const struct path *)NULL,
|
||||
|
|
@ -24,9 +24,9 @@ dnl #
|
|||
dnl # 3.9 API
|
||||
dnl # vfs_getattr(struct path *p, struct kstat *s)
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_2ARGS_VFS_GETATTR], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_2ARGS_VFS_GETATTR], [
|
||||
AC_MSG_CHECKING([whether vfs_getattr() wants 2 args])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/fs.h>
|
||||
],[
|
||||
vfs_getattr((struct path *) NULL,
|
||||
|
|
@ -44,9 +44,9 @@ dnl #
|
|||
dnl # <3.9 API
|
||||
dnl # vfs_getattr(struct vfsmount *v, struct dentry *d, struct kstat *k)
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_3ARGS_VFS_GETATTR], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_3ARGS_VFS_GETATTR], [
|
||||
AC_MSG_CHECKING([whether vfs_getattr() wants 3 args])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/fs.h>
|
||||
],[
|
||||
vfs_getattr((struct vfsmount *)NULL,
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ dnl # of just two functions: one which uses io_schedule() and one which just
|
|||
dnl # uses schedule(). This API change was made to consolidate all of those
|
||||
dnl # redundant wait functions.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_WAIT_ON_BIT], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_WAIT_ON_BIT], [
|
||||
AC_MSG_CHECKING([whether wait_on_bit() takes an action])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/wait.h>
|
||||
],[
|
||||
int (*action)(void *) = NULL;
|
||||
|
|
@ -26,9 +26,9 @@ dnl #
|
|||
dnl # 4.13 API change
|
||||
dnl # Renamed struct wait_queue -> struct wait_queue_entry.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_WAIT_QUEUE_ENTRY_T], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_WAIT_QUEUE_ENTRY_T], [
|
||||
AC_MSG_CHECKING([whether wait_queue_entry_t exists])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/wait.h>
|
||||
],[
|
||||
wait_queue_entry_t *entry __attribute__ ((unused));
|
||||
|
|
@ -46,9 +46,9 @@ dnl # 4.13 API change
|
|||
dnl # Renamed wait_queue_head::task_list -> wait_queue_head::head
|
||||
dnl # Renamed wait_queue_entry::task_list -> wait_queue_entry::entry
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_WAIT_QUEUE_HEAD_ENTRY], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_WAIT_QUEUE_HEAD_ENTRY], [
|
||||
AC_MSG_CHECKING([whether wq_head->head and wq_entry->entry exist])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/wait.h>
|
||||
|
||||
#ifdef HAVE_WAIT_QUEUE_ENTRY_T
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ dnl #
|
|||
dnl # zlib inflate compat,
|
||||
dnl # Verify the kernel has CONFIG_ZLIB_INFLATE support enabled.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_CONFIG_ZLIB_INFLATE], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_CONFIG_ZLIB_INFLATE], [
|
||||
AC_MSG_CHECKING([whether CONFIG_ZLIB_INFLATE is defined])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#if !defined(CONFIG_ZLIB_INFLATE) && \
|
||||
!defined(CONFIG_ZLIB_INFLATE_MODULE)
|
||||
#error CONFIG_ZLIB_INFLATE not defined
|
||||
|
|
@ -23,9 +23,9 @@ dnl #
|
|||
dnl # zlib deflate compat,
|
||||
dnl # Verify the kernel has CONFIG_ZLIB_DEFLATE support enabled.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_CONFIG_ZLIB_DEFLATE], [
|
||||
AC_DEFUN([ZFS_AC_KERNEL_CONFIG_ZLIB_DEFLATE], [
|
||||
AC_MSG_CHECKING([whether CONFIG_ZLIB_DEFLATE is defined])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#if !defined(CONFIG_ZLIB_DEFLATE) && \
|
||||
!defined(CONFIG_ZLIB_DEFLATE_MODULE)
|
||||
#error CONFIG_ZLIB_DEFLATE not defined
|
||||
|
|
@ -47,9 +47,9 @@ dnl # This was done to avoid always having to allocate the maximum size
|
|||
dnl # workspace (268K). The caller can now specific the windowBits and
|
||||
dnl # memLevel compression parameters to get a smaller workspace.
|
||||
dnl #
|
||||
AC_DEFUN([SPL_AC_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE],
|
||||
AC_DEFUN([ZFS_AC_KERNEL_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE],
|
||||
[AC_MSG_CHECKING([whether zlib_deflate_workspacesize() wants 2 args])
|
||||
SPL_LINUX_TRY_COMPILE([
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#include <linux/zlib.h>
|
||||
],[
|
||||
return zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL);
|
||||
|
|
|
|||
253
config/kernel.m4
253
config/kernel.m4
|
|
@ -3,12 +3,39 @@ dnl # Default ZFS kernel configuration
|
|||
dnl #
|
||||
AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
|
||||
ZFS_AC_KERNEL
|
||||
ZFS_AC_SPL
|
||||
ZFS_AC_QAT
|
||||
ZFS_AC_TEST_MODULE
|
||||
ZFS_AC_KERNEL_MISC_MINOR
|
||||
ZFS_AC_KERNEL_OBJTOOL
|
||||
ZFS_AC_KERNEL_CONFIG
|
||||
ZFS_AC_KERNEL_CTL_NAME
|
||||
ZFS_AC_KERNEL_PDE_DATA
|
||||
ZFS_AC_KERNEL_SET_FS_PWD_WITH_CONST
|
||||
ZFS_AC_KERNEL_2ARGS_VFS_FSYNC
|
||||
ZFS_AC_KERNEL_FS_STRUCT_SPINLOCK
|
||||
ZFS_AC_KERNEL_KUIDGID_T
|
||||
ZFS_AC_KERNEL_FALLOCATE
|
||||
ZFS_AC_KERNEL_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE
|
||||
ZFS_AC_KERNEL_RWSEM_SPINLOCK_IS_RAW
|
||||
ZFS_AC_KERNEL_RWSEM_ACTIVITY
|
||||
ZFS_AC_KERNEL_RWSEM_ATOMIC_LONG_COUNT
|
||||
ZFS_AC_KERNEL_SCHED_RT_HEADER
|
||||
ZFS_AC_KERNEL_SCHED_SIGNAL_HEADER
|
||||
ZFS_AC_KERNEL_IO_SCHEDULE_TIMEOUT
|
||||
ZFS_AC_KERNEL_4ARGS_VFS_GETATTR
|
||||
ZFS_AC_KERNEL_3ARGS_VFS_GETATTR
|
||||
ZFS_AC_KERNEL_2ARGS_VFS_GETATTR
|
||||
ZFS_AC_KERNEL_USLEEP_RANGE
|
||||
ZFS_AC_KERNEL_KMEM_CACHE_ALLOCFLAGS
|
||||
ZFS_AC_KERNEL_KMEM_CACHE_CREATE_USERCOPY
|
||||
ZFS_AC_KERNEL_WAIT_ON_BIT
|
||||
ZFS_AC_KERNEL_WAIT_QUEUE_ENTRY_T
|
||||
ZFS_AC_KERNEL_WAIT_QUEUE_HEAD_ENTRY
|
||||
ZFS_AC_KERNEL_INODE_LOCK
|
||||
ZFS_AC_KERNEL_GROUP_INFO_GID
|
||||
ZFS_AC_KERNEL_WRITE
|
||||
ZFS_AC_KERNEL_READ
|
||||
ZFS_AC_KERNEL_TIMER_FUNCTION_TIMER_LIST
|
||||
ZFS_AC_KERNEL_DECLARE_EVENT_CLASS
|
||||
ZFS_AC_KERNEL_CURRENT_BIO_TAIL
|
||||
ZFS_AC_KERNEL_SUPER_USER_NS
|
||||
|
|
@ -106,6 +133,8 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
|
|||
ZFS_AC_KERNEL_FST_MOUNT
|
||||
ZFS_AC_KERNEL_SHRINK
|
||||
ZFS_AC_KERNEL_SHRINK_CONTROL_HAS_NID
|
||||
ZFS_AC_KERNEL_SHRINK_CONTROL_STRUCT
|
||||
ZFS_AC_KERNEL_SHRINKER_CALLBACK
|
||||
ZFS_AC_KERNEL_S_INSTANCES_LIST_HEAD
|
||||
ZFS_AC_KERNEL_S_D_OP
|
||||
ZFS_AC_KERNEL_BDI
|
||||
|
|
@ -275,204 +304,6 @@ AC_DEFUN([ZFS_AC_KERNEL], [
|
|||
ZFS_AC_MODULE_SYMVERS
|
||||
])
|
||||
|
||||
|
||||
dnl #
|
||||
dnl # Detect the SPL module to be built against
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_SPL], [
|
||||
AC_ARG_WITH([spl],
|
||||
AS_HELP_STRING([--with-spl=PATH],
|
||||
[Path to spl source]),
|
||||
AS_IF([test "$withval" = "yes"],
|
||||
AC_MSG_ERROR([--with-spl=PATH requires a PATH]),
|
||||
[splsrc="$withval"]))
|
||||
|
||||
AC_ARG_WITH([spl-obj],
|
||||
AS_HELP_STRING([--with-spl-obj=PATH],
|
||||
[Path to spl build objects]),
|
||||
[splbuild="$withval"])
|
||||
|
||||
AC_ARG_WITH([spl-timeout],
|
||||
AS_HELP_STRING([--with-spl-timeout=SECS],
|
||||
[Wait SECS for SPL header and symver file @<:@default=0@:>@]),
|
||||
[timeout="$withval"], [timeout=0])
|
||||
|
||||
dnl #
|
||||
dnl # The existence of spl.release.in is used to identify a valid
|
||||
dnl # source directory. In order of preference:
|
||||
dnl #
|
||||
splsrc0="/var/lib/dkms/spl/${VERSION}/build"
|
||||
splsrc1="/usr/local/src/spl-${VERSION}/${LINUX_VERSION}"
|
||||
splsrc2="/usr/local/src/spl-${VERSION}"
|
||||
splsrc3="/usr/src/spl-${VERSION}/${LINUX_VERSION}"
|
||||
splsrc4="/usr/src/spl-${VERSION}"
|
||||
splsrc5="../spl/"
|
||||
splsrc6="$LINUX"
|
||||
|
||||
AC_MSG_CHECKING([spl source directory])
|
||||
AS_IF([test -z "${splsrc}"], [
|
||||
[all_spl_sources="
|
||||
${splsrc0}
|
||||
${splsrc1}
|
||||
${splsrc2}
|
||||
${splsrc3}
|
||||
${splsrc4}
|
||||
${splsrc5}
|
||||
${splsrc6}"],
|
||||
AS_IF([ test -e "${splsrc0}/spl.release.in"], [
|
||||
splsrc=${splsrc0}
|
||||
], [ test -e "${splsrc1}/spl.release.in"], [
|
||||
splsrc=${splsrc1}
|
||||
], [ test -e "${splsrc2}/spl.release.in"], [
|
||||
splsrc=${splsrc2}
|
||||
], [ test -e "${splsrc3}/spl.release.in"], [
|
||||
splsrc=$(readlink -f "${splsrc3}")
|
||||
], [ test -e "${splsrc4}/spl.release.in" ], [
|
||||
splsrc=${splsrc4}
|
||||
], [ test -e "${splsrc5}/spl.release.in"], [
|
||||
splsrc=$(readlink -f "${splsrc5}")
|
||||
], [ test -e "${splsrc6}/spl.release.in" ], [
|
||||
splsrc=${splsrc6}
|
||||
], [
|
||||
splsrc="[Not found]"
|
||||
])
|
||||
], [
|
||||
[all_spl_sources="$withval"],
|
||||
AS_IF([test "$splsrc" = "NONE"], [
|
||||
splbuild=NONE
|
||||
splsrcver=NONE
|
||||
])
|
||||
])
|
||||
|
||||
AC_MSG_RESULT([$splsrc])
|
||||
AS_IF([ test ! -e "$splsrc/spl.release.in"], [
|
||||
AC_MSG_ERROR([
|
||||
*** Please make sure the kmod spl devel package for your distribution
|
||||
*** is installed then try again. If that fails you can specify the
|
||||
*** location of the spl source with the '--with-spl=PATH' option.
|
||||
*** The spl version must match the version of ZFS you are building,
|
||||
*** ${VERSION}. Failed to find spl.release.in in the following:
|
||||
$all_spl_sources])
|
||||
])
|
||||
|
||||
dnl #
|
||||
dnl # The existence of the spl_config.h is used to identify a valid
|
||||
dnl # spl object directory. In many cases the object and source
|
||||
dnl # directory are the same, however the objects may also reside
|
||||
dnl # is a subdirectory named after the kernel version.
|
||||
dnl #
|
||||
dnl # This file is supposed to be available after DKMS finishes
|
||||
dnl # building the SPL kernel module for the target kernel. The
|
||||
dnl # '--with-spl-timeout' option can be passed to pause here,
|
||||
dnl # waiting for the file to appear from a concurrently building
|
||||
dnl # SPL package.
|
||||
dnl #
|
||||
AC_MSG_CHECKING([spl build directory])
|
||||
|
||||
all_spl_config_locs="${splsrc}/${LINUX_VERSION}
|
||||
${splsrc}"
|
||||
|
||||
while true; do
|
||||
AS_IF([test -z "$splbuild"], [
|
||||
AS_IF([ test -e "${splsrc}/${LINUX_VERSION}/spl_config.h" ], [
|
||||
splbuild="${splsrc}/${LINUX_VERSION}"
|
||||
], [ test -e "${splsrc}/spl_config.h" ], [
|
||||
splbuild="${splsrc}"
|
||||
], [ find -L "${splsrc}" -name spl_config.h 2> /dev/null | grep -wq spl_config.h ], [
|
||||
splbuild=$(find -L "${splsrc}" -name spl_config.h | sed 's,/spl_config.h,,')
|
||||
], [
|
||||
splbuild="[Not found]"
|
||||
])
|
||||
])
|
||||
AS_IF([test -e "$splbuild/spl_config.h" -o $timeout -le 0], [
|
||||
break;
|
||||
], [
|
||||
sleep 1
|
||||
timeout=$((timeout-1))
|
||||
])
|
||||
done
|
||||
|
||||
AC_MSG_RESULT([$splbuild])
|
||||
AS_IF([ ! test -e "$splbuild/spl_config.h"], [
|
||||
AC_MSG_ERROR([
|
||||
*** Please make sure the kmod spl devel <kernel> package for your
|
||||
*** distribution is installed then try again. If that fails you
|
||||
*** can specify the location of the spl objects with the
|
||||
*** '--with-spl-obj=PATH' option. Failed to find spl_config.h in
|
||||
*** any of the following:
|
||||
$all_spl_config_locs])
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING([spl source version])
|
||||
AS_IF([test -r $splbuild/spl_config.h &&
|
||||
fgrep -q SPL_META_VERSION $splbuild/spl_config.h], [
|
||||
|
||||
splsrcver=`(echo "#include <spl_config.h>";
|
||||
echo "splsrcver=SPL_META_VERSION-SPL_META_RELEASE") |
|
||||
cpp -I $splbuild |
|
||||
grep "^splsrcver=" | tr -d \" | cut -d= -f2`
|
||||
])
|
||||
|
||||
AS_IF([test -z "$splsrcver"], [
|
||||
AC_MSG_RESULT([Not found])
|
||||
AC_MSG_ERROR([
|
||||
*** Cannot determine the version of the spl source.
|
||||
*** Please prepare the spl source before running this script])
|
||||
])
|
||||
|
||||
AC_MSG_RESULT([$splsrcver])
|
||||
|
||||
SPL=${splsrc}
|
||||
SPL_OBJ=${splbuild}
|
||||
SPL_VERSION=${splsrcver}
|
||||
|
||||
AC_SUBST(SPL)
|
||||
AC_SUBST(SPL_OBJ)
|
||||
AC_SUBST(SPL_VERSION)
|
||||
|
||||
dnl #
|
||||
dnl # Detect the name used for the SPL Module.symvers file. If one
|
||||
dnl # does not exist this is likely because the SPL has been configured
|
||||
dnl # but not built. The '--with-spl-timeout' option can be passed
|
||||
dnl # to pause here, waiting for the file to appear from a concurrently
|
||||
dnl # building SPL package. If the file does not appear in time, a good
|
||||
dnl # guess is made as to what this file will be named based on what it
|
||||
dnl # is named in the kernel build products. This file will first be
|
||||
dnl # used at link time so if the guess is wrong the build will fail
|
||||
dnl # then. This unfortunately means the ZFS package does not contain a
|
||||
dnl # reliable mechanism to detect symbols exported by the SPL at
|
||||
dnl # configure time.
|
||||
dnl #
|
||||
AC_MSG_CHECKING([spl file name for module symbols])
|
||||
SPL_SYMBOLS=NONE
|
||||
|
||||
while true; do
|
||||
AS_IF([test -r $SPL_OBJ/Module.symvers], [
|
||||
SPL_SYMBOLS=Module.symvers
|
||||
], [test -r $SPL_OBJ/Modules.symvers], [
|
||||
SPL_SYMBOLS=Modules.symvers
|
||||
], [test -r $SPL_OBJ/module/Module.symvers], [
|
||||
SPL_SYMBOLS=Module.symvers
|
||||
], [test -r $SPL_OBJ/module/Modules.symvers], [
|
||||
SPL_SYMBOLS=Modules.symvers
|
||||
])
|
||||
|
||||
AS_IF([test $SPL_SYMBOLS != NONE -o $timeout -le 0], [
|
||||
break;
|
||||
], [
|
||||
sleep 1
|
||||
timeout=$((timeout-1))
|
||||
])
|
||||
done
|
||||
|
||||
AS_IF([test "$SPL_SYMBOLS" = NONE], [
|
||||
SPL_SYMBOLS=$LINUX_SYMBOLS
|
||||
])
|
||||
|
||||
AC_MSG_RESULT([$SPL_SYMBOLS])
|
||||
AC_SUBST(SPL_SYMBOLS)
|
||||
])
|
||||
|
||||
dnl #
|
||||
dnl # Detect the QAT module to be built against
|
||||
dnl # QAT provides hardware acceleration for data compression:
|
||||
|
|
@ -603,6 +434,9 @@ AC_DEFUN([ZFS_AC_KERNEL_CONFIG], [
|
|||
|
||||
ZFS_AC_KERNEL_CONFIG_THREAD_SIZE
|
||||
ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC
|
||||
ZFS_AC_KERNEL_CONFIG_TRIM_UNUSED_KSYMS
|
||||
ZFS_AC_KERNEL_CONFIG_ZLIB_INFLATE
|
||||
ZFS_AC_KERNEL_CONFIG_ZLIB_DEFLATE
|
||||
])
|
||||
|
||||
dnl #
|
||||
|
|
@ -672,6 +506,27 @@ AC_DEFUN([ZFS_AC_KERNEL_CONFIG_DEBUG_LOCK_ALLOC], [
|
|||
], [])
|
||||
])
|
||||
|
||||
dnl #
|
||||
dnl # Check CONFIG_TRIM_UNUSED_KSYMS
|
||||
dnl #
|
||||
dnl # Verify the kernel has CONFIG_TRIM_UNUSED_KSYMS disabled.
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_KERNEL_CONFIG_TRIM_UNUSED_KSYMS], [
|
||||
AC_MSG_CHECKING([whether CONFIG_TRIM_UNUSED_KSYM is disabled])
|
||||
ZFS_LINUX_TRY_COMPILE([
|
||||
#if defined(CONFIG_TRIM_UNUSED_KSYMS)
|
||||
#error CONFIG_TRIM_UNUSED_KSYMS not defined
|
||||
#endif
|
||||
],[ ],[
|
||||
AC_MSG_RESULT([yes])
|
||||
],[
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_ERROR([
|
||||
*** This kernel has unused symbols trimming enabled, please disable.
|
||||
*** Rebuild the kernel with CONFIG_TRIM_UNUSED_KSYMS=n set.])
|
||||
])
|
||||
])
|
||||
|
||||
dnl #
|
||||
dnl # ZFS_LINUX_CONFTEST_H
|
||||
dnl #
|
||||
|
|
|
|||
|
|
@ -95,6 +95,63 @@ AC_DEFUN([ZFS_AC_DEBUGINFO], [
|
|||
AC_MSG_RESULT([$enable_debuginfo])
|
||||
])
|
||||
|
||||
dnl #
|
||||
dnl # Disabled by default, provides basic memory tracking. Track the total
|
||||
dnl # number of bytes allocated with kmem_alloc() and freed with kmem_free().
|
||||
dnl # Then at module unload time if any bytes were leaked it will be reported
|
||||
dnl # on the console.
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_DEBUG_KMEM], [
|
||||
AC_MSG_CHECKING([whether basic kmem accounting is enabled])
|
||||
AC_ARG_ENABLE([debug-kmem],
|
||||
[AS_HELP_STRING([--enable-debug-kmem],
|
||||
[Enable basic kmem accounting @<:@default=no@:>@])],
|
||||
[],
|
||||
[enable_debug_kmem=no])
|
||||
|
||||
AS_IF([test "x$enable_debug_kmem" = xyes], [
|
||||
KERNEL_DEBUG_CPPFLAGS+=" -DDEBUG_KMEM"
|
||||
DEBUG_KMEM_ZFS="_with_debug_kmem"
|
||||
], [
|
||||
DEBUG_KMEM_ZFS="_without_debug_kmem"
|
||||
])
|
||||
|
||||
AC_SUBST(KERNEL_DEBUG_CPPFLAGS)
|
||||
AC_SUBST(DEBUG_KMEM_ZFS)
|
||||
|
||||
AC_MSG_RESULT([$enable_debug_kmem])
|
||||
])
|
||||
|
||||
dnl #
|
||||
dnl # Disabled by default, provides detailed memory tracking. This feature
|
||||
dnl # also requires --enable-debug-kmem to be set. When enabled not only will
|
||||
dnl # total bytes be tracked but also the location of every kmem_alloc() and
|
||||
dnl # kmem_free(). When the module is unloaded a list of all leaked addresses
|
||||
dnl # and where they were allocated will be dumped to the console. Enabling
|
||||
dnl # this feature has a significant impact on performance but it makes finding
|
||||
dnl # memory leaks straight forward.
|
||||
dnl #
|
||||
AC_DEFUN([ZFS_AC_DEBUG_KMEM_TRACKING], [
|
||||
AC_MSG_CHECKING([whether detailed kmem tracking is enabled])
|
||||
AC_ARG_ENABLE([debug-kmem-tracking],
|
||||
[AS_HELP_STRING([--enable-debug-kmem-tracking],
|
||||
[Enable detailed kmem tracking @<:@default=no@:>@])],
|
||||
[],
|
||||
[enable_debug_kmem_tracking=no])
|
||||
|
||||
AS_IF([test "x$enable_debug_kmem_tracking" = xyes], [
|
||||
KERNEL_DEBUG_CPPFLAGS+=" -DDEBUG_KMEM_TRACKING"
|
||||
DEBUG_KMEM_TRACKING_ZFS="_with_debug_kmem_tracking"
|
||||
], [
|
||||
DEBUG_KMEM_TRACKING_ZFS="_without_debug_kmem_tracking"
|
||||
])
|
||||
|
||||
AC_SUBST(KERNEL_DEBUG_CPPFLAGS)
|
||||
AC_SUBST(DEBUG_KMEM_TRACKING_ZFS)
|
||||
|
||||
AC_MSG_RESULT([$enable_debug_kmem_tracking])
|
||||
])
|
||||
|
||||
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
|
||||
ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE
|
||||
ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE
|
||||
|
|
@ -183,10 +240,11 @@ AC_DEFUN([ZFS_AC_RPM], [
|
|||
])
|
||||
|
||||
RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"'
|
||||
RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_ZFS) 1"'
|
||||
RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_TRACKING_ZFS) 1"'
|
||||
RPM_DEFINE_COMMON+=' --define "$(DEBUGINFO_ZFS) 1"'
|
||||
RPM_DEFINE_COMMON+=' --define "$(ASAN_ZFS) 1"'
|
||||
|
||||
|
||||
RPM_DEFINE_UTIL=' --define "_initconfdir $(DEFAULT_INITCONF_DIR)"'
|
||||
|
||||
dnl # Make the next three RPM_DEFINE_UTIL additions conditional, since
|
||||
|
|
@ -221,8 +279,6 @@ AC_DEFUN([ZFS_AC_RPM], [
|
|||
])
|
||||
|
||||
RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"'
|
||||
RPM_DEFINE_KMOD+=' --define "require_spldir $(SPL)"'
|
||||
RPM_DEFINE_KMOD+=' --define "require_splobj $(SPL_OBJ)"'
|
||||
RPM_DEFINE_KMOD+=' --define "ksrc $(LINUX)"'
|
||||
RPM_DEFINE_KMOD+=' --define "kobj $(LINUX_OBJ)"'
|
||||
RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"'
|
||||
|
|
|
|||
|
|
@ -60,9 +60,12 @@ AC_DEFUN([ZFS_AC_META], [
|
|||
|
||||
ZFS_META_VERSION=_ZFS_AC_META_GETVAL([Version]);
|
||||
if test -n "$ZFS_META_VERSION"; then
|
||||
AC_DEFINE_UNQUOTED([ZFS_META_VERSION], ["$ZFS_META_VERSION"],
|
||||
[Define the project version.]
|
||||
)
|
||||
AC_DEFINE_UNQUOTED([ZFS_META_VERSION],
|
||||
["$ZFS_META_VERSION"],
|
||||
[Define the project version.])
|
||||
AC_DEFINE_UNQUOTED([SPL_META_VERSION],
|
||||
[ZFS_META_VERSION],
|
||||
[Defined for legacy compatibility.])
|
||||
AC_SUBST([ZFS_META_VERSION])
|
||||
fi
|
||||
|
||||
|
|
@ -86,9 +89,12 @@ AC_DEFUN([ZFS_AC_META], [
|
|||
fi
|
||||
|
||||
if test -n "$ZFS_META_RELEASE"; then
|
||||
AC_DEFINE_UNQUOTED([ZFS_META_RELEASE], ["$ZFS_META_RELEASE"],
|
||||
[Define the project release.]
|
||||
)
|
||||
AC_DEFINE_UNQUOTED([ZFS_META_RELEASE],
|
||||
["$ZFS_META_RELEASE"],
|
||||
[Define the project release.])
|
||||
AC_DEFINE_UNQUOTED([SPL_META_RELEASE],
|
||||
[ZFS_META_RELEASE],
|
||||
[Defined for legacy compatibility.])
|
||||
AC_SUBST([ZFS_META_RELEASE])
|
||||
|
||||
RELEASE="$ZFS_META_RELEASE"
|
||||
|
|
@ -108,9 +114,11 @@ AC_DEFUN([ZFS_AC_META], [
|
|||
test -n "$ZFS_META_RELEASE" &&
|
||||
ZFS_META_ALIAS="$ZFS_META_ALIAS-$ZFS_META_RELEASE"
|
||||
AC_DEFINE_UNQUOTED([ZFS_META_ALIAS],
|
||||
["$ZFS_META_ALIAS"],
|
||||
[Define the project alias string.]
|
||||
)
|
||||
["$ZFS_META_ALIAS"],
|
||||
[Define the project alias string.])
|
||||
AC_DEFINE_UNQUOTED([SPL_META_ALIAS],
|
||||
[ZFS_META_ALIAS],
|
||||
[Defined for legacy compatibility.])
|
||||
AC_SUBST([ZFS_META_ALIAS])
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -57,6 +57,8 @@ ZFS_AC_PACKAGE
|
|||
ZFS_AC_CONFIG
|
||||
ZFS_AC_DEBUG
|
||||
ZFS_AC_DEBUGINFO
|
||||
ZFS_AC_DEBUG_KMEM
|
||||
ZFS_AC_DEBUG_KMEM_TRACKING
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
|
|
@ -135,8 +137,12 @@ AC_CONFIG_FILES([
|
|||
module/zfs/Makefile
|
||||
module/lua/Makefile
|
||||
module/icp/Makefile
|
||||
module/spl/Makefile
|
||||
include/Makefile
|
||||
include/linux/Makefile
|
||||
include/spl/Makefile
|
||||
include/spl/rpc/Makefile
|
||||
include/spl/sys/Makefile
|
||||
include/sys/Makefile
|
||||
include/sys/fs/Makefile
|
||||
include/sys/fm/Makefile
|
||||
|
|
|
|||
10
copy-builtin
10
copy-builtin
|
|
@ -32,7 +32,7 @@ make clean || true
|
|||
rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs"
|
||||
cp --recursive include "$KERNEL_DIR/include/zfs"
|
||||
cp --recursive module "$KERNEL_DIR/fs/zfs"
|
||||
cp zfs_config.h "$KERNEL_DIR/"
|
||||
cp zfs_config.h "$KERNEL_DIR/include/zfs/"
|
||||
|
||||
for MODULE in "${MODULES[@]}"
|
||||
do
|
||||
|
|
@ -43,7 +43,6 @@ done
|
|||
cat > "$KERNEL_DIR/fs/zfs/Kconfig" <<"EOF"
|
||||
config ZFS
|
||||
tristate "ZFS filesystem support"
|
||||
depends on SPL
|
||||
depends on EFI_PARTITION
|
||||
select ZLIB_INFLATE
|
||||
select ZLIB_DEFLATE
|
||||
|
|
@ -60,11 +59,10 @@ EOF
|
|||
{
|
||||
cat <<-"EOF"
|
||||
ZFS_MODULE_CFLAGS = -I$(srctree)/include/zfs
|
||||
ZFS_MODULE_CFLAGS += -I$(srctree)/include/spl
|
||||
ZFS_MODULE_CFLAGS += -include $(srctree)/spl_config.h
|
||||
ZFS_MODULE_CFLAGS += -include $(srctree)/zfs_config.h
|
||||
ZFS_MODULE_CFLAGS += -I$(srctree)/include/zfs/spl
|
||||
ZFS_MODULE_CFLAGS += -include $(srctree)/include/zfs/zfs_config.h
|
||||
ZFS_MODULE_CFLAGS += -std=gnu99 -Wno-declaration-after-statement
|
||||
ZFS_MODULE_CPPFLAGS = -DHAVE_SPL -D_KERNEL
|
||||
ZFS_MODULE_CPPFLAGS = -D_KERNEL
|
||||
ZFS_MODULE_CPPFLAGS += -UDEBUG -DNDEBUG
|
||||
export ZFS_MODULE_CFLAGS ZFS_MODULE_CPPFLAGS
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SUBDIRS = linux sys
|
||||
SUBDIRS = linux spl sys
|
||||
|
||||
COMMON_H = \
|
||||
$(top_srcdir)/include/zfeature_common.h \
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ KERNEL_H = \
|
|||
$(top_srcdir)/include/linux/simd_x86.h \
|
||||
$(top_srcdir)/include/linux/simd_aarch64.h \
|
||||
$(top_srcdir)/include/linux/mod_compat.h \
|
||||
$(top_srcdir)/include/linux/page_compat.h
|
||||
$(top_srcdir)/include/linux/page_compat.h \
|
||||
$(top_srcdir)/include/linux/compiler_compat.h
|
||||
|
||||
USER_H =
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@
|
|||
#include <linux/blkdev.h>
|
||||
#include <linux/elevator.h>
|
||||
#include <linux/backing-dev.h>
|
||||
#include <linux/hdreg.h>
|
||||
|
||||
#ifndef HAVE_FMODE_T
|
||||
typedef unsigned __bitwise__ fmode_t;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,17 @@
|
|||
* CDDL HEADER END
|
||||
*/
|
||||
|
||||
#ifndef _LIBSPL_ATTR_H
|
||||
#define _LIBSPL_ATTR_H
|
||||
/*
|
||||
* Copyright (C) 2018 Lawrence Livermore National Security, LLC.
|
||||
*/
|
||||
|
||||
#endif /* _LIBSPL_ATTR_H */
|
||||
#ifndef _ZFS_COMPILER_COMPAT_H
|
||||
#define _ZFS_COMPILER_COMPAT_H
|
||||
|
||||
#include <linux/compiler.h>
|
||||
|
||||
#if !defined(READ_ONCE)
|
||||
#define READ_ONCE(x) ACCESS_ONCE(x)
|
||||
#endif
|
||||
|
||||
#endif /* _ZFS_COMPILER_COMPAT_H */
|
||||
1
include/spl/Makefile.am
Normal file
1
include/spl/Makefile.am
Normal file
|
|
@ -0,0 +1 @@
|
|||
SUBDIRS = rpc sys
|
||||
7
include/spl/rpc/Makefile.am
Normal file
7
include/spl/rpc/Makefile.am
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
KERNEL_H = \
|
||||
$(top_srcdir)/include/spl/rpc/xdr.h
|
||||
|
||||
if CONFIG_KERNEL
|
||||
kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/rpc
|
||||
kernel_HEADERS = $(KERNEL_H)
|
||||
endif
|
||||
61
include/spl/sys/Makefile.am
Normal file
61
include/spl/sys/Makefile.am
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
KERNEL_H = \
|
||||
$(top_srcdir)/include/spl/sys/acl.h \
|
||||
$(top_srcdir)/include/spl/sys/atomic.h \
|
||||
$(top_srcdir)/include/spl/sys/byteorder.h \
|
||||
$(top_srcdir)/include/spl/sys/callb.h \
|
||||
$(top_srcdir)/include/spl/sys/callo.h \
|
||||
$(top_srcdir)/include/spl/sys/cmn_err.h \
|
||||
$(top_srcdir)/include/spl/sys/condvar.h \
|
||||
$(top_srcdir)/include/spl/sys/console.h \
|
||||
$(top_srcdir)/include/spl/sys/cred.h \
|
||||
$(top_srcdir)/include/spl/sys/ctype.h \
|
||||
$(top_srcdir)/include/spl/sys/debug.h \
|
||||
$(top_srcdir)/include/spl/sys/disp.h \
|
||||
$(top_srcdir)/include/spl/sys/dkioc_free_util.h \
|
||||
$(top_srcdir)/include/spl/sys/dkio.h \
|
||||
$(top_srcdir)/include/spl/sys/errno.h \
|
||||
$(top_srcdir)/include/spl/sys/fcntl.h \
|
||||
$(top_srcdir)/include/spl/sys/file.h \
|
||||
$(top_srcdir)/include/spl/sys/inttypes.h \
|
||||
$(top_srcdir)/include/spl/sys/isa_defs.h \
|
||||
$(top_srcdir)/include/spl/sys/kmem_cache.h \
|
||||
$(top_srcdir)/include/spl/sys/kmem.h \
|
||||
$(top_srcdir)/include/spl/sys/kobj.h \
|
||||
$(top_srcdir)/include/spl/sys/kstat.h \
|
||||
$(top_srcdir)/include/spl/sys/list.h \
|
||||
$(top_srcdir)/include/spl/sys/mode.h \
|
||||
$(top_srcdir)/include/spl/sys/mutex.h \
|
||||
$(top_srcdir)/include/spl/sys/param.h \
|
||||
$(top_srcdir)/include/spl/sys/processor.h \
|
||||
$(top_srcdir)/include/spl/sys/proc.h \
|
||||
$(top_srcdir)/include/spl/sys/random.h \
|
||||
$(top_srcdir)/include/spl/sys/rwlock.h \
|
||||
$(top_srcdir)/include/spl/sys/shrinker.h \
|
||||
$(top_srcdir)/include/spl/sys/sid.h \
|
||||
$(top_srcdir)/include/spl/sys/signal.h \
|
||||
$(top_srcdir)/include/spl/sys/stat.h \
|
||||
$(top_srcdir)/include/spl/sys/strings.h \
|
||||
$(top_srcdir)/include/spl/sys/sunddi.h \
|
||||
$(top_srcdir)/include/spl/sys/sysmacros.h \
|
||||
$(top_srcdir)/include/spl/sys/systeminfo.h \
|
||||
$(top_srcdir)/include/spl/sys/taskq.h \
|
||||
$(top_srcdir)/include/spl/sys/thread.h \
|
||||
$(top_srcdir)/include/spl/sys/time.h \
|
||||
$(top_srcdir)/include/spl/sys/timer.h \
|
||||
$(top_srcdir)/include/spl/sys/tsd.h \
|
||||
$(top_srcdir)/include/spl/sys/types32.h \
|
||||
$(top_srcdir)/include/spl/sys/types.h \
|
||||
$(top_srcdir)/include/spl/sys/uio.h \
|
||||
$(top_srcdir)/include/spl/sys/user.h \
|
||||
$(top_srcdir)/include/spl/sys/vfs.h \
|
||||
$(top_srcdir)/include/spl/sys/vmem.h \
|
||||
$(top_srcdir)/include/spl/sys/vmsystm.h \
|
||||
$(top_srcdir)/include/spl/sys/vnode.h \
|
||||
$(top_srcdir)/include/spl/sys/wait.h \
|
||||
$(top_srcdir)/include/spl/sys/zmod.h \
|
||||
$(top_srcdir)/include/spl/sys/zone.h
|
||||
|
||||
if CONFIG_KERNEL
|
||||
kerneldir = @prefix@/src/zfs-$(VERSION)/include/spl/sys
|
||||
kernel_HEADERS = $(KERNEL_H)
|
||||
endif
|
||||
|
|
@ -92,7 +92,6 @@ void spl_dumpstack(void);
|
|||
*/
|
||||
#ifdef NDEBUG
|
||||
|
||||
#define SPL_DEBUG_STR ""
|
||||
#define ASSERT(x) ((void)0)
|
||||
#define ASSERTV(x)
|
||||
#define ASSERT3B(x,y,z) ((void)0)
|
||||
|
|
@ -108,7 +107,6 @@ void spl_dumpstack(void);
|
|||
*/
|
||||
#else
|
||||
|
||||
#define SPL_DEBUG_STR " (DEBUG mode)"
|
||||
#define ASSERT(cond) VERIFY(cond)
|
||||
#define ASSERTV(x) x
|
||||
#define ASSERT3B(x,y,z) VERIFY3B(x, y, z)
|
||||
|
|
|
|||
|
|
@ -20,11 +20,28 @@
|
|||
* CDDL HEADER END
|
||||
*/
|
||||
/*
|
||||
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
|
||||
* Copyright 2000 Sun Microsystems, Inc. All rights reserved.
|
||||
* Use is subject to license terms.
|
||||
*/
|
||||
|
||||
#ifndef _LIBSPL_SYS_COMPRESS_H
|
||||
#define _LIBSPL_SYS_COMPRESS_H
|
||||
/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
|
||||
/* All Rights Reserved */
|
||||
|
||||
#endif /* _LIBSPL_SYS_COMPRESS_H */
|
||||
/*
|
||||
* University Copyright- Copyright (c) 1982, 1986, 1988
|
||||
* The Regents of the University of California
|
||||
* All Rights Reserved
|
||||
*
|
||||
* University Acknowledgment- Portions of this document are derived from
|
||||
* software developed by the University of California, Berkeley, and its
|
||||
* contributors.
|
||||
*/
|
||||
|
||||
#ifndef _SYS_ERRNO_H
|
||||
#define _SYS_ERRNO_H
|
||||
|
||||
#include <linux/errno.h>
|
||||
|
||||
#define ENOTSUP EOPNOTSUPP
|
||||
|
||||
#endif /* _SYS_ERRNO_H */
|
||||
|
|
@ -28,6 +28,7 @@
|
|||
#include <sys/types.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/lockdep.h>
|
||||
#include <linux/compiler_compat.h>
|
||||
|
||||
typedef enum {
|
||||
MUTEX_DEFAULT = 0,
|
||||
|
|
@ -59,7 +60,7 @@ spl_mutex_clear_owner(kmutex_t *mp)
|
|||
mp->m_owner = NULL;
|
||||
}
|
||||
|
||||
#define mutex_owner(mp) (ACCESS_ONCE((mp)->m_owner))
|
||||
#define mutex_owner(mp) (READ_ONCE((mp)->m_owner))
|
||||
#define mutex_owned(mp) (mutex_owner(mp) == current)
|
||||
#define MUTEX_HELD(mp) mutex_owned(mp)
|
||||
#define MUTEX_NOT_HELD(mp) (!MUTEX_HELD(mp))
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
#include <sys/types.h>
|
||||
#include <linux/rwsem.h>
|
||||
#include <linux/sched.h>
|
||||
|
||||
/* Linux kernel compatibility */
|
||||
#if defined(CONFIG_PREEMPT_RT_FULL)
|
||||
|
|
|
|||
|
|
@ -79,7 +79,6 @@
|
|||
#define max_ncpus num_possible_cpus()
|
||||
#define boot_ncpus num_online_cpus()
|
||||
#define CPU_SEQID smp_processor_id()
|
||||
#define _NOTE(x)
|
||||
#define is_system_labeled() 0
|
||||
|
||||
#ifndef RLIM64_INFINITY
|
||||
|
|
|
|||
|
|
@ -28,11 +28,11 @@
|
|||
#include <linux/types.h>
|
||||
|
||||
#ifndef ULLONG_MAX
|
||||
#define ULLONG_MAX (~0ULL)
|
||||
#define ULLONG_MAX (~0ULL)
|
||||
#endif
|
||||
|
||||
#ifndef LLONG_MAX
|
||||
#define LLONG_MAX ((long long)(~0ULL>>1))
|
||||
#define LLONG_MAX ((long long)(~0ULL>>1))
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@
|
|||
#define AT_MTIME ATTR_MTIME
|
||||
#define AT_CTIME ATTR_CTIME
|
||||
|
||||
#define ATTR_XVATTR (1 << 31)
|
||||
#define ATTR_XVATTR (1U << 31)
|
||||
#define AT_XVATTR ATTR_XVATTR
|
||||
|
||||
#define ATTR_IATTR_MASK (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_SIZE | \
|
||||
|
|
@ -120,7 +120,7 @@ typedef enum vtype {
|
|||
|
||||
typedef struct vattr {
|
||||
enum vtype va_type; /* vnode type */
|
||||
uint_t va_mask; /* attribute bit-mask */
|
||||
uint32_t va_mask; /* attribute bit-mask */
|
||||
ushort_t va_mode; /* acc mode */
|
||||
uid_t va_uid; /* owner uid */
|
||||
gid_t va_gid; /* owner gid */
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ COMMON_H = \
|
|||
$(top_srcdir)/include/sys/mmp.h \
|
||||
$(top_srcdir)/include/sys/mntent.h \
|
||||
$(top_srcdir)/include/sys/multilist.h \
|
||||
$(top_srcdir)/include/sys/note.h \
|
||||
$(top_srcdir)/include/sys/nvpair.h \
|
||||
$(top_srcdir)/include/sys/nvpair_impl.h \
|
||||
$(top_srcdir)/include/sys/pathname.h \
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
#define _ABD_H
|
||||
|
||||
#include <sys/isa_defs.h>
|
||||
#include <sys/int_types.h>
|
||||
#include <sys/debug.h>
|
||||
#include <sys/refcount.h>
|
||||
#ifdef _KERNEL
|
||||
|
|
@ -116,7 +115,7 @@ int abd_cmp(abd_t *, abd_t *);
|
|||
int abd_cmp_buf_off(abd_t *, const void *, size_t, size_t);
|
||||
void abd_zero_off(abd_t *, size_t, size_t);
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
unsigned int abd_scatter_bio_map_off(struct bio *, abd_t *, unsigned int,
|
||||
size_t);
|
||||
unsigned long abd_nr_pages_off(abd_t *, unsigned int, size_t);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
#ifdef _KERNEL
|
||||
#include <sys/varargs.h>
|
||||
#include <sys/nvpair.h>
|
||||
#else
|
||||
#include <libnvpair.h>
|
||||
|
|
|
|||
|
|
@ -47,6 +47,8 @@ extern "C" {
|
|||
#define _NOTE(s)
|
||||
#endif
|
||||
|
||||
#define NOTE(s) _NOTE(s)
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
@ -29,11 +29,6 @@
|
|||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/errno.h>
|
||||
#include <sys/va_list.h>
|
||||
|
||||
#if defined(_KERNEL) && !defined(_BOOT)
|
||||
#include <sys/kmem.h>
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
@ -142,7 +137,7 @@ struct nv_alloc_ops {
|
|||
extern const nv_alloc_ops_t *nv_fixed_ops;
|
||||
extern nv_alloc_t *nv_alloc_nosleep;
|
||||
|
||||
#if defined(_KERNEL) && !defined(_BOOT)
|
||||
#if defined(_KERNEL)
|
||||
extern nv_alloc_t *nv_alloc_sleep;
|
||||
extern nv_alloc_t *nv_alloc_pushpage;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
#define _SYS_XVATTR_H
|
||||
|
||||
#include <sys/vnode.h>
|
||||
#include <sys/strings.h>
|
||||
|
||||
#define AV_SCANSTAMP_SZ 32 /* length of anti-virus scanstamp */
|
||||
|
||||
|
|
|
|||
|
|
@ -32,31 +32,25 @@
|
|||
|
||||
#include <sys/note.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/t_lock.h>
|
||||
#include <sys/atomic.h>
|
||||
#include <sys/sysmacros.h>
|
||||
#include <sys/bitmap.h>
|
||||
#include <sys/vmsystm.h>
|
||||
#include <sys/condvar.h>
|
||||
#include <sys/cmn_err.h>
|
||||
#include <sys/kmem.h>
|
||||
#include <sys/kmem_cache.h>
|
||||
#include <sys/vmem.h>
|
||||
#include <sys/taskq.h>
|
||||
#include <sys/buf.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/cpuvar.h>
|
||||
#include <sys/kobj.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/disp.h>
|
||||
#include <sys/debug.h>
|
||||
#include <sys/random.h>
|
||||
#include <sys/strings.h>
|
||||
#include <sys/byteorder.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/list.h>
|
||||
#include <sys/uio_impl.h>
|
||||
#include <sys/dirent.h>
|
||||
#include <sys/time.h>
|
||||
#include <vm/seg_kmem.h>
|
||||
#include <sys/zone.h>
|
||||
#include <sys/sdt.h>
|
||||
#include <sys/kstat.h>
|
||||
|
|
@ -76,8 +70,6 @@
|
|||
#define _SYS_MUTEX_H
|
||||
#define _SYS_RWLOCK_H
|
||||
#define _SYS_CONDVAR_H
|
||||
#define _SYS_SYSTM_H
|
||||
#define _SYS_T_LOCK_H
|
||||
#define _SYS_VNODE_H
|
||||
#define _SYS_VFS_H
|
||||
#define _SYS_SUNDDI_H
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#ifndef _SYS_FS_ZFS_DELAY_H
|
||||
#define _SYS_FS_ZFS_DELAY_H
|
||||
|
||||
#include <linux/delay_compat.h>
|
||||
#include <sys/timer.h>
|
||||
|
||||
/*
|
||||
* Generic wrapper to sleep until a given time.
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
#define _SYS_FS_ZFS_FUID_H
|
||||
|
||||
#ifdef _KERNEL
|
||||
#include <sys/kidmap.h>
|
||||
#include <sys/sid.h>
|
||||
#include <sys/dmu.h>
|
||||
#include <sys/zfs_vfsops.h>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#ifdef _KERNEL
|
||||
#include <sys/isa_defs.h>
|
||||
#include <sys/types32.h>
|
||||
#include <sys/attr.h>
|
||||
#include <sys/list.h>
|
||||
#include <sys/dmu.h>
|
||||
#include <sys/sa.h>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include <linux/dcache_compat.h>
|
||||
#include <linux/exportfs.h>
|
||||
#include <linux/falloc.h>
|
||||
#include <linux/file_compat.h>
|
||||
#include <linux/parser.h>
|
||||
#include <linux/task_io_accounting_ops.h>
|
||||
#include <linux/vfs_compat.h>
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <unistd.h>
|
||||
#include <uuid/uuid.h>
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@
|
|||
#include <libintl.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/inttypes.h>
|
||||
#include <sys/note.h>
|
||||
#include <stdarg.h>
|
||||
#include <note.h>
|
||||
#include "libnvpair.h"
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -26,8 +26,10 @@
|
|||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#include <libzfs.h>
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@
|
|||
#include <time.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/wait.h>
|
||||
|
|
|
|||
|
|
@ -4,19 +4,16 @@ libspldir = $(includedir)/libspl
|
|||
libspl_HEADERS = \
|
||||
$(top_srcdir)/lib/libspl/include/assert.h \
|
||||
$(top_srcdir)/lib/libspl/include/atomic.h \
|
||||
$(top_srcdir)/lib/libspl/include/attr.h \
|
||||
$(top_srcdir)/lib/libspl/include/devid.h \
|
||||
$(top_srcdir)/lib/libspl/include/libdevinfo.h \
|
||||
$(top_srcdir)/lib/libspl/include/libgen.h \
|
||||
$(top_srcdir)/lib/libspl/include/libshare.h \
|
||||
$(top_srcdir)/lib/libspl/include/limits.h \
|
||||
$(top_srcdir)/lib/libspl/include/locale.h \
|
||||
$(top_srcdir)/lib/libspl/include/note.h \
|
||||
$(top_srcdir)/lib/libspl/include/statcommon.h \
|
||||
$(top_srcdir)/lib/libspl/include/stdio.h \
|
||||
$(top_srcdir)/lib/libspl/include/stdlib.h \
|
||||
$(top_srcdir)/lib/libspl/include/string.h \
|
||||
$(top_srcdir)/lib/libspl/include/strings.h \
|
||||
$(top_srcdir)/lib/libspl/include/stropts.h \
|
||||
$(top_srcdir)/lib/libspl/include/synch.h \
|
||||
$(top_srcdir)/lib/libspl/include/thread.h \
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
/*
|
||||
* CDDL HEADER START
|
||||
*
|
||||
* The contents of this file are subject to the terms of the
|
||||
* Common Development and Distribution License, Version 1.0 only
|
||||
* (the "License"). You may not use this file except in compliance
|
||||
* with the License.
|
||||
*
|
||||
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
||||
* or http://www.opensolaris.org/os/licensing.
|
||||
* See the License for the specific language governing permissions
|
||||
* and limitations under the License.
|
||||
*
|
||||
* When distributing Covered Code, include this CDDL HEADER in each
|
||||
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
||||
* If applicable, add the following below this CDDL HEADER, with the
|
||||
* fields enclosed by brackets "[]" replaced with your own identifying
|
||||
* information: Portions Copyright [yyyy] [name of copyright owner]
|
||||
*
|
||||
* CDDL HEADER END
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 1994 by Sun Microsystems, Inc.
|
||||
*/
|
||||
|
||||
/*
|
||||
* note.h: interface for annotating source with info for tools
|
||||
*
|
||||
* NOTE is the default interface, but if the identifier NOTE is in use for
|
||||
* some other purpose, you may prepare a similar header file using your own
|
||||
* identifier, mapping that identifier to _NOTE. Also, exported header
|
||||
* files should *not* use NOTE, since the name may already be in use in
|
||||
* a program's namespace. Rather, exported header files should include
|
||||
* sys/note.h directly and use _NOTE. For consistency, all kernel source
|
||||
* should use _NOTE.
|
||||
*/
|
||||
|
||||
#ifndef _NOTE_H
|
||||
#define _NOTE_H
|
||||
|
||||
#include <sys/note.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define NOTE _NOTE
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _NOTE_H */
|
||||
|
|
@ -8,7 +8,6 @@ libspl_HEADERS = \
|
|||
$(top_srcdir)/lib/libspl/include/sys/byteorder.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/callb.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/cmn_err.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/compress.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/cred.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/debug.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/dkio.h \
|
||||
|
|
@ -28,7 +27,6 @@ libspl_HEADERS = \
|
|||
$(top_srcdir)/lib/libspl/include/sys/mkdev.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/mnttab.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/mount.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/note.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/param.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/policy.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/poll.h \
|
||||
|
|
@ -37,11 +35,12 @@ libspl_HEADERS = \
|
|||
$(top_srcdir)/lib/libspl/include/sys/signal.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/stack.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/stat.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/stdtypes.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/strings.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/stropts.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/sunddi.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/sysmacros.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/systeminfo.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/systm.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/time.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/types32.h \
|
||||
$(top_srcdir)/lib/libspl/include/sys/types.h \
|
||||
|
|
|
|||
|
|
@ -19,12 +19,36 @@
|
|||
*
|
||||
* CDDL HEADER END
|
||||
*/
|
||||
/*
|
||||
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
|
||||
* Use is subject to license terms.
|
||||
*/
|
||||
|
||||
#ifndef _LIBSPL_SYS_SYSTM_H
|
||||
#define _LIBSPL_SYS_SYSTM_H
|
||||
#ifndef __SYS_STDTYPES_H
|
||||
#define __SYS_STDTYPES_H
|
||||
|
||||
#endif /* _LIBSPL_SYS_SYSTM_H */
|
||||
typedef enum {
|
||||
B_FALSE = 0,
|
||||
B_TRUE = 1
|
||||
} boolean_t;
|
||||
|
||||
typedef unsigned char uchar_t;
|
||||
typedef unsigned short ushort_t;
|
||||
typedef unsigned int uint_t;
|
||||
typedef unsigned long ulong_t;
|
||||
typedef unsigned long long u_longlong_t;
|
||||
typedef long long longlong_t;
|
||||
|
||||
typedef longlong_t offset_t;
|
||||
typedef u_longlong_t u_offset_t;
|
||||
typedef u_longlong_t len_t;
|
||||
typedef longlong_t diskaddr_t;
|
||||
|
||||
typedef ulong_t pgcnt_t; /* number of pages */
|
||||
typedef long spgcnt_t; /* signed number of pages */
|
||||
|
||||
typedef short pri_t;
|
||||
typedef ushort_t o_mode_t; /* old file attribute type */
|
||||
|
||||
typedef int major_t;
|
||||
typedef int minor_t;
|
||||
|
||||
typedef short index_t;
|
||||
|
||||
#endif /* __SYS_STDTYPES_H */
|
||||
|
|
@ -24,10 +24,10 @@
|
|||
* Use is subject to license terms.
|
||||
*/
|
||||
|
||||
#ifndef _LIBSPL_STRINGS_H
|
||||
#define _LIBSPL_STRINGS_H
|
||||
#ifndef _LIBSPL_SYS_STRINGS_H
|
||||
#define _LIBSPL_SYS_STRINGS_H
|
||||
|
||||
#include <string.h>
|
||||
#include_next <strings.h>
|
||||
#include <strings.h>
|
||||
|
||||
#endif
|
||||
|
|
@ -98,4 +98,6 @@
|
|||
#define offsetof(s, m) ((size_t)(&(((s *)0)->m)))
|
||||
#endif
|
||||
|
||||
#define _NOTE(x)
|
||||
|
||||
#endif /* _LIBSPL_SYS_SYSMACROS_H */
|
||||
|
|
|
|||
|
|
@ -38,40 +38,15 @@
|
|||
#include_next <sys/types.h>
|
||||
#include <sys/types32.h>
|
||||
#include <sys/va_list.h>
|
||||
#include <sys/stdtypes.h>
|
||||
|
||||
#ifndef HAVE_INTTYPES
|
||||
#include <inttypes.h>
|
||||
|
||||
typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
|
||||
|
||||
typedef unsigned char uchar_t;
|
||||
typedef unsigned short ushort_t;
|
||||
typedef unsigned int uint_t;
|
||||
typedef unsigned long ulong_t;
|
||||
|
||||
typedef long long longlong_t;
|
||||
typedef unsigned long long u_longlong_t;
|
||||
#endif /* HAVE_INTTYPES */
|
||||
|
||||
typedef longlong_t offset_t;
|
||||
typedef u_longlong_t u_offset_t;
|
||||
typedef u_longlong_t len_t;
|
||||
typedef longlong_t diskaddr_t;
|
||||
|
||||
typedef ulong_t pgcnt_t; /* number of pages */
|
||||
typedef long spgcnt_t; /* signed number of pages */
|
||||
|
||||
typedef short pri_t;
|
||||
|
||||
typedef int zoneid_t;
|
||||
typedef int projid_t;
|
||||
|
||||
typedef int major_t;
|
||||
typedef int minor_t;
|
||||
|
||||
typedef ushort_t o_mode_t; /* old file attribute type */
|
||||
typedef short index_t;
|
||||
|
||||
/*
|
||||
* Definitions remaining from previous partial support for 64-bit file
|
||||
* offsets. This partial support for devices greater than 2gb requires
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@
|
|||
#ifndef _SYS_TYPES32_H
|
||||
#define _SYS_TYPES32_H
|
||||
|
||||
|
||||
|
||||
#include <sys/inttypes.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
|
||||
#define FACILITY_FMT "%s (%s): "
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <attr.h>
|
||||
#include <stddef.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
|
|
@ -49,7 +48,7 @@
|
|||
#include "libzfs_impl.h"
|
||||
|
||||
#define ZDIFF_SNAPDIR "/.zfs/snapshot/"
|
||||
#define ZDIFF_SHARESDIR "/.zfs/shares/"
|
||||
#define ZDIFF_SHARESDIR "/.zfs/shares/"
|
||||
#define ZDIFF_PREFIX "zfs-diff-%d"
|
||||
|
||||
#define ZDIFF_ADDED '+'
|
||||
|
|
|
|||
|
|
@ -93,7 +93,6 @@ descriptions_obj:
|
|||
.SH AUTHORS
|
||||
This man page was written by Darik Horn <dajhorn@vanadac.com>.
|
||||
.SH SEE ALSO
|
||||
.BR splat (1),
|
||||
.BR zfs (8),
|
||||
.BR zpool-features (5),
|
||||
.BR ztest (1)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
dist_man_MANS = vdev_id.conf.5 zpool-features.5 zfs-module-parameters.5 zfs-events.5
|
||||
dist_man_MANS = \
|
||||
vdev_id.conf.5 \
|
||||
zpool-features.5 \
|
||||
spl-module-parameters.5 \
|
||||
zfs-module-parameters.5 \
|
||||
zfs-events.5
|
||||
|
||||
install-data-local:
|
||||
$(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man5"
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ subdir-m += avl
|
|||
subdir-m += icp
|
||||
subdir-m += lua
|
||||
subdir-m += nvpair
|
||||
subdir-m += spl
|
||||
subdir-m += unicode
|
||||
subdir-m += zcommon
|
||||
subdir-m += zfs
|
||||
|
|
@ -10,11 +11,11 @@ INSTALL_MOD_DIR ?= extra
|
|||
|
||||
ZFS_MODULE_CFLAGS += -std=gnu99 -Wno-declaration-after-statement
|
||||
ZFS_MODULE_CFLAGS += @KERNEL_DEBUG_CFLAGS@
|
||||
ZFS_MODULE_CFLAGS += -include @SPL_OBJ@/spl_config.h
|
||||
ZFS_MODULE_CFLAGS += -include @abs_top_builddir@/zfs_config.h
|
||||
ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include -I@SPL@/include -I@SPL@
|
||||
ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include/spl
|
||||
ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include
|
||||
|
||||
ZFS_MODULE_CPPFLAGS += -DHAVE_SPL -D_KERNEL
|
||||
ZFS_MODULE_CPPFLAGS += -D_KERNEL
|
||||
ZFS_MODULE_CPPFLAGS += @KERNEL_DEBUG_CPPFLAGS@
|
||||
|
||||
@CONFIG_QAT_TRUE@ZFS_MODULE_CFLAGS += -I@QAT_SRC@/include
|
||||
|
|
@ -25,21 +26,6 @@ export ZFS_MODULE_CFLAGS ZFS_MODULE_CPPFLAGS
|
|||
SUBDIR_TARGETS = icp lua
|
||||
|
||||
modules:
|
||||
@# Make the exported SPL symbols available to these modules.
|
||||
@# They may be in the root of SPL_OBJ when building against
|
||||
@# installed devel headers, or they may be in the module
|
||||
@# subdirectory when building against the spl source tree.
|
||||
@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
|
||||
cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
|
||||
elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
|
||||
cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
|
||||
else \
|
||||
echo -e "\n" \
|
||||
"*** Missing spl symbols ensure you have built the spl:\n" \
|
||||
"*** - @SPL_OBJ@/@SPL_SYMBOLS@, or\n" \
|
||||
"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
|
||||
exit 1; \
|
||||
fi
|
||||
list='$(SUBDIR_TARGETS)'; for targetdir in $$list; do \
|
||||
$(MAKE) -C $$targetdir; \
|
||||
done
|
||||
|
|
@ -50,7 +36,6 @@ clean:
|
|||
@# is defined. This indicates that kernel modules should be built.
|
||||
@CONFIG_KERNEL_TRUE@ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNEL_MAKE@ $@
|
||||
|
||||
if [ -f @SPL_SYMBOLS@ ]; then $(RM) @SPL_SYMBOLS@; fi
|
||||
if [ -f @LINUX_SYMBOLS@ ]; then $(RM) @LINUX_SYMBOLS@; fi
|
||||
if [ -f Module.markers ]; then $(RM) Module.markers; fi
|
||||
|
||||
|
|
|
|||
|
|
@ -992,7 +992,9 @@ avl_destroy_nodes(avl_tree_t *tree, void **cookie)
|
|||
return (AVL_NODE2DATA(node, off));
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
#include <linux/module.h>
|
||||
|
||||
static int __init
|
||||
avl_init(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,12 +29,7 @@
|
|||
* Portions copyright (c) 2013, Saso Kiselkov, All rights reserved
|
||||
*/
|
||||
|
||||
/* determine where we can get bcopy/bzero declarations */
|
||||
#ifdef _KERNEL
|
||||
#include <sys/systm.h>
|
||||
#else
|
||||
#include <strings.h>
|
||||
#endif
|
||||
#include <sys/strings.h>
|
||||
#include <sys/edonr.h>
|
||||
#include <sys/debug.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#ifndef _CRYPTO_EDONR_BYTEORDER_H
|
||||
#define _CRYPTO_EDONR_BYTEORDER_H
|
||||
|
||||
|
||||
#include <sys/sysmacros.h>
|
||||
#include <sys/param.h>
|
||||
|
||||
#if defined(__BYTE_ORDER)
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
#define SKEIN_PORT_CODE /* instantiate any code in skein_port.h */
|
||||
|
||||
#include <sys/sysmacros.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/note.h>
|
||||
#include <sys/skein.h> /* get the Skein API definitions */
|
||||
#include "skein_impl.h" /* get internal definitions */
|
||||
|
||||
|
|
|
|||
|
|
@ -25,16 +25,11 @@
|
|||
#define _SKEIN_IMPL_H_
|
||||
|
||||
#include <sys/skein.h>
|
||||
#include <sys/strings.h>
|
||||
#include <sys/note.h>
|
||||
#include "skein_impl.h"
|
||||
#include "skein_port.h"
|
||||
|
||||
/* determine where we can get bcopy/bzero declarations */
|
||||
#ifdef _KERNEL
|
||||
#include <sys/systm.h>
|
||||
#else
|
||||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* "Internal" Skein definitions
|
||||
* -- not needed for sequential hashing API, but will be
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
#define _SKEIN_PORT_H_
|
||||
|
||||
#include <sys/types.h> /* get integer type definitions */
|
||||
#include <sys/systm.h> /* for bcopy() */
|
||||
|
||||
#ifndef RotL_64
|
||||
#define RotL_64(x, N) (((x) << (N)) | ((x) >> (64 - (N))))
|
||||
|
|
|
|||
|
|
@ -915,7 +915,7 @@ crypto_decrypt_single(crypto_context_t context, crypto_data_t *ciphertext,
|
|||
return (error);
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
EXPORT_SYMBOL(crypto_cipher_init_prov);
|
||||
EXPORT_SYMBOL(crypto_cipher_init);
|
||||
EXPORT_SYMBOL(crypto_encrypt_prov);
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ crypto_destroy_ctx_template(crypto_ctx_template_t tmpl)
|
|||
kmem_free(ctx_tmpl, sizeof (kcf_ctx_template_t));
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
EXPORT_SYMBOL(crypto_create_ctx_template);
|
||||
EXPORT_SYMBOL(crypto_destroy_ctx_template);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -482,7 +482,7 @@ crypto_digest_single(crypto_context_t context, crypto_data_t *data,
|
|||
return (error);
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
EXPORT_SYMBOL(crypto_digest_prov);
|
||||
EXPORT_SYMBOL(crypto_digest);
|
||||
EXPORT_SYMBOL(crypto_digest_init_prov);
|
||||
|
|
|
|||
|
|
@ -635,7 +635,7 @@ crypto_mac_single(crypto_context_t context, crypto_data_t *data,
|
|||
return (error);
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
EXPORT_SYMBOL(crypto_mac_prov);
|
||||
EXPORT_SYMBOL(crypto_mac);
|
||||
EXPORT_SYMBOL(crypto_mac_verify_prov);
|
||||
|
|
|
|||
|
|
@ -122,6 +122,6 @@ kcf_walk_ntfylist(uint32_t event, void *event_arg)
|
|||
mutex_exit(&ntfy_list_lock);
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
EXPORT_SYMBOL(crypto_mech2id);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ icp_init(void)
|
|||
return (0);
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
module_exit(icp_fini);
|
||||
module_init(icp_init);
|
||||
MODULE_AUTHOR(ZFS_META_AUTHOR);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
#include <sys/crypto/common.h>
|
||||
#include <sys/crypto/spi.h>
|
||||
#include <sys/sysmacros.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/edonr.h>
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
#include <sys/crypto/common.h>
|
||||
#include <sys/crypto/spi.h>
|
||||
#include <sys/sysmacros.h>
|
||||
#include <sys/systm.h>
|
||||
#define SKEIN_MODULE_IMPL
|
||||
#include <sys/skein.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1279,7 +1279,7 @@ LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
|
|||
luaC_objbarrier(L, f1, *up2);
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
|
||||
static int __init
|
||||
lua_init(void)
|
||||
|
|
|
|||
|
|
@ -788,7 +788,7 @@ LUALIB_API void luaL_checkversion_ (lua_State *L, lua_Number ver) {
|
|||
lua_pop(L, 1);
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
|
||||
EXPORT_SYMBOL(luaL_argerror);
|
||||
EXPORT_SYMBOL(luaL_error);
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ LUAMOD_API int luaopen_base (lua_State *L) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
|
||||
EXPORT_SYMBOL(luaopen_base);
|
||||
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ LUAMOD_API int luaopen_coroutine (lua_State *L) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
|
||||
EXPORT_SYMBOL(luaopen_coroutine);
|
||||
|
||||
|
|
|
|||
|
|
@ -1032,7 +1032,7 @@ LUAMOD_API int luaopen_string (lua_State *L) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
#if defined(_KERNEL) && defined(HAVE_SPL)
|
||||
#if defined(_KERNEL)
|
||||
|
||||
EXPORT_SYMBOL(luaopen_string);
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue