106e92b2df
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-14 12:55:08 -07:00
98d5d8bd50
Add missing include path for FMA aware zpool command.
2010-05-14 11:57:48 -07:00
0c443b1d13
Create linux-kernel-device topic branch.
...
This branch contains the majority of the changes required to cleanly
intergrate with Linux style special devices (/dev/zfs). Mainly this
means dropping all the Solaris style callbacks and replacing them
with the Linux equivilants. Additionally, this means slightly
expanding the zfs_ioc_* functions to include a 'struct file *' to
allow the tracking of private data for each open file descriptor.
This is very helpful when you need to maintain a little information
about the open file between ioctls().
2010-05-14 11:48:06 -07:00
20ee89f0f2
Add nvpair_alloc_fixed.c in to libnvpair build.
2010-05-14 10:55:02 -07:00
98660aec20
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:32:01 -07:00
82782d7874
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-04-29 12:32:00 -07:00
aa4a91aef5
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 12:32:00 -07:00
354bebb795
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 12:31:59 -07:00
89154c98f9
Update build system to include nvpair_alloc_fixed.c.
2010-04-29 12:24:25 -07:00
f26fce7b17
Strip ident pragma from module/nvpair/nvpair_alloc_fixed.c
2010-04-29 12:23:12 -07:00
66ba722b0a
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-04-29 12:04:36 -07:00
49dff0437f
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-04-29 12:04:35 -07:00
620a5ae89b
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-04-29 12:04:33 -07:00
f3017eccb7
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-04-29 12:04:33 -07:00
b9610ade84
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-04-29 12:04:33 -07:00
7a062682fb
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-04-29 12:04:32 -07:00
9c10b70375
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-04-29 12:04:31 -07:00
9d8e4f07ff
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-04-29 12:04:30 -07:00
dcf9769135
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-04-29 12:04:28 -07:00
d4ee043aaf
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-04-29 12:04:27 -07:00
3b31b7c0e8
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-04-29 12:04:26 -07:00
ec11b6cecb
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-04-29 12:04:26 -07:00
0d327d93b6
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-04-29 12:04:25 -07:00
1264752aa8
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-04-29 12:04:24 -07:00
2fbc59f539
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-04-29 12:04:23 -07:00
c0b678ce5e
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-04-29 12:04:23 -07:00
937c0f121a
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-04-29 12:04:22 -07:00
c880752748
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-04-29 12:04:21 -07:00
4d4cda51e2
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-04-29 12:04:20 -07:00
0ff8a25a8a
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-04-29 12:04:20 -07:00
cf4e5324e9
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-04-29 12:04:18 -07:00
eb6835bf73
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-04-29 12:04:18 -07:00
695903c308
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-04-29 12:04:17 -07:00
036db491b4
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-04-29 12:04:17 -07:00
1a18829f86
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-04-29 12:04:15 -07:00
539276c157
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-04-29 12:04:15 -07:00
5b30cb5202
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-04-29 12:04:14 -07:00
8efa2c0cc8
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-04-29 12:04:13 -07:00
f75b8d294a
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-04-29 12:04:12 -07:00
fa08457e03
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-04-29 12:04:11 -07:00
c28e1220a2
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-04-29 12:04:10 -07:00
b1e72bd6a5
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-04-29 12:04:10 -07:00
17839ab2dd
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-04-29 12:04:09 -07:00
a749db3e7c
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-04-29 12:04:08 -07:00
05b4f88b78
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-04-29 12:04:07 -07:00
5f53726a08
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-04-29 12:04:07 -07:00
1ef5fcd9e7
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-04-29 12:04:06 -07:00
16b4aa089e
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-04-29 12:04:05 -07:00
e5edc5104d
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-04-29 12:04:04 -07:00
0ddf938871
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-04-29 12:04:04 -07:00
Brian Behlendorf