Brian Behlendorf
1365576b3e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-18 14:22:24 -07:00
Brian Behlendorf
060284b353
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-18 14:21:35 -07:00
Brian Behlendorf
a8b8cc4801
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-18 14:21:10 -07:00
Brian Behlendorf
bc611acf53
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-18 14:20:35 -07:00
Brian Behlendorf
ad97c53c74
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-18 14:19:57 -07:00
Brian Behlendorf
2d5d5fbc92
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-08-18 14:19:25 -07:00
Brian Behlendorf
87bdf80fb7
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-18 14:19:13 -07:00
Brian Behlendorf
147adbe815
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-18 14:18:40 -07:00
Brian Behlendorf
e4b55cfbff
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 14:18:36 -07:00
Brian Behlendorf
5d83878f46
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 14:18:34 -07:00
Brian Behlendorf
e134b976b6
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-08-18 14:18:33 -07:00
Brian Behlendorf
b29c1f87a0
Required build 121 updates for gcc-missing-braces
2009-08-18 14:08:46 -07:00
Brian Behlendorf
6e43f5a80b
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
module/zfs/rrwlock.c
module/zfs/zfs_ioctl.c
2009-08-18 12:59:17 -07:00
Brian Behlendorf
8b02e1a43f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-18 12:35:12 -07:00
Brian Behlendorf
a1909790e4
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-18 12:34:40 -07:00
Brian Behlendorf
b3561355b8
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-18 12:33:54 -07:00
Brian Behlendorf
954484f75d
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
...
Conflicts:
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
2009-08-18 12:32:53 -07:00
Brian Behlendorf
df5482e65d
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-08-18 12:30:04 -07:00
Brian Behlendorf
2d067983d6
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-18 12:29:48 -07:00
Brian Behlendorf
c67303e092
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dsl_dataset.c
module/zfs/rrwlock.c
module/zfs/spa_history.c
module/zfs/zfs_ioctl.c
2009-08-18 12:26:09 -07:00
Brian Behlendorf
50c623ccef
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-08-18 12:10:55 -07:00
Brian Behlendorf
b3ea816a68
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2009-08-18 12:09:36 -07:00
Brian Behlendorf
d205b25a74
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-08-18 12:09:10 -07:00
Brian Behlendorf
b99b422796
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 12:08:58 -07:00
Brian Behlendorf
41b297a27f
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-08-18 12:08:46 -07:00
Brian Behlendorf
e5e4fadc34
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
module/zfs/dmu.c
module/zfs/dsl_deleg.c
module/zfs/rrwlock.c
module/zfs/vdev_raidz.c
2009-08-18 12:04:53 -07:00
Brian Behlendorf
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
Brian Behlendorf
9dec42d15d
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-31 14:06:28 -07:00
Brian Behlendorf
21dee98331
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-31 14:05:42 -07:00
Brian Behlendorf
2c5abffc5f
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-31 14:05:19 -07:00
Brian Behlendorf
e03d56f19c
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-31 14:04:46 -07:00
Brian Behlendorf
8539aeef21
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-31 14:04:15 -07:00
Brian Behlendorf
3f4eb7aad6
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-31 14:03:44 -07:00
Brian Behlendorf
744f29654f
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-31 14:03:32 -07:00
Brian Behlendorf
4880532956
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-07-31 14:02:54 -07:00
Brian Behlendorf
9f5e45ef4d
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-31 14:02:49 -07:00
Brian Behlendorf
cf44f97b96
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-31 14:02:48 -07:00
Brian Behlendorf
252846a145
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-07-31 14:02:46 -07:00
Brian Behlendorf
cfd9e9936f
Fix an accidentally introduced formatting issue in zfs output.
...
Because the local 'index' variable shadows the index() function
it was replaced by 'i'. Unfortunately when I made this change
I accidentally replaced one instance with 'j' resulting in the
short decimal values being printed incorrectly.
2009-07-31 13:50:21 -07:00
Brian Behlendorf
dbee607bbd
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-29 21:31:26 -07:00
Brian Behlendorf
54f3881f7a
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-29 21:30:36 -07:00
Brian Behlendorf
3decd9c0ee
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-29 21:30:06 -07:00
Brian Behlendorf
9cdb618921
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-29 21:29:28 -07:00
Brian Behlendorf
4f6e1daa09
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-29 21:28:53 -07:00
Brian Behlendorf
402d41bc4a
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-29 21:28:19 -07:00
Brian Behlendorf
d29bbc0642
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-29 21:28:05 -07:00
Brian Behlendorf
640e02d051
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-29 21:27:17 -07:00
Brian Behlendorf
2d86fb2788
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-29 21:27:13 -07:00
Brian Behlendorf
e2bbeb5e61
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-29 21:27:06 -07:00
Brian Behlendorf
f80c505f4d
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-29 21:27:04 -07:00
Brian Behlendorf
72d2035ed3
Updated gcc in fc11 flagged a new uninitialized variable.
2009-07-29 21:17:47 -07:00
Brian Behlendorf
cbb3788214
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-24 09:19:34 -07:00
Brian Behlendorf
8f1db6316f
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-24 09:18:50 -07:00
Brian Behlendorf
35b101b8d1
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-24 09:18:29 -07:00
Brian Behlendorf
9b7658ca98
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-24 09:17:54 -07:00
Brian Behlendorf
be0b3f923e
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-24 09:17:21 -07:00
Brian Behlendorf
6216ca6cfd
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-24 09:16:52 -07:00
Brian Behlendorf
fe9f4bdd27
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-24 09:16:41 -07:00
Brian Behlendorf
4edfcf44ec
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-24 09:15:59 -07:00
Brian Behlendorf
82ca18caae
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-24 09:15:56 -07:00
Brian Behlendorf
825c086a4e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-07-24 09:15:55 -07:00
Brian Behlendorf
e4610d7991
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2009-07-24 09:15:53 -07:00
Brian Behlendorf
1b4dfb80fb
Increase buffer size for nvlist for large configurations
...
It's still not clear to me why the default value here is large
enough Solaris. I hit this limit again when setting up 120 SATA
drives configured as 15 raidz2 groups each containing 8 drives.
We expect to go bigger so we may just want to spend a little
time and figure out how to make this all dynamic.
2009-07-24 08:53:18 -07:00
Brian Behlendorf
15c4a8be0c
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-07-07 15:35:07 -07:00
Brian Behlendorf
31157f3a90
Disable zpool_relabel_disk() which requires libefi until we have it.
2009-07-07 15:26:39 -07:00
Brian Behlendorf
23e01e6cde
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-07-07 15:07:37 -07:00
Brian Behlendorf
24402e5c15
Drop duplicate defines
2009-07-07 14:58:56 -07:00
Brian Behlendorf
c35e61eea2
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-07 14:50:41 -07:00
Brian Behlendorf
04aa3d5ef9
Header aclutils.h only needed by idmap.
2009-07-07 14:41:19 -07:00
Brian Behlendorf
678b02cd8e
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-07 14:32:59 -07:00
Brian Behlendorf
78d7c67598
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 14:32:34 -07:00
Brian Behlendorf
daebbab116
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-07 14:31:41 -07:00
Brian Behlendorf
aa8600a1c2
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-07 14:31:15 -07:00
Brian Behlendorf
acd26f0d75
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-07 14:30:34 -07:00
Brian Behlendorf
315f906678
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 14:29:57 -07:00
Brian Behlendorf
46f41441da
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-07 14:29:21 -07:00
Brian Behlendorf
33804ec976
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-07 14:29:09 -07:00
Brian Behlendorf
7c76f3ce22
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 14:28:18 -07:00
Brian Behlendorf
3ad5361df2
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 14:28:14 -07:00
Brian Behlendorf
ba97ae2628
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-07-07 14:28:13 -07:00
Brian Behlendorf
ed3bd6f446
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-07-07 14:19:35 -07:00
Brian Behlendorf
798cf63309
New topic branch for minor acl related fixes
2009-07-07 14:18:47 -07:00
Brian Behlendorf
81729c2c73
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-07 14:14:24 -07:00
Brian Behlendorf
dd3f9c1ed4
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 14:13:57 -07:00
Brian Behlendorf
e945eb4fe1
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-07-07 14:13:02 -07:00
Brian Behlendorf
46041d7761
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-07-07 14:12:35 -07:00
Brian Behlendorf
8e7e41cfb0
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
...
Conflicts:
lib/libzfs/libzfs_dataset.c
2009-07-07 14:11:46 -07:00
Brian Behlendorf
23f5686f20
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-07-07 14:09:10 -07:00
Brian Behlendorf
96ddc12975
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-07-07 14:08:35 -07:00
Brian Behlendorf
02bc7929d4
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-07-07 14:08:22 -07:00
Brian Behlendorf
1ff9c70da3
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
...
Conflicts:
lib/libzfs/libzfs_dataset.c
2009-07-07 14:04:47 -07:00
Brian Behlendorf
34422f0ffa
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-07-07 13:50:32 -07:00
Brian Behlendorf
47502cd94b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-07 13:50:31 -07:00
Brian Behlendorf
fb26df15c8
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-07-07 13:50:30 -07:00
Brian Behlendorf
cad9fa40e1
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-07-07 13:50:29 -07:00
Brian Behlendorf
a2423197e1
Resolve missing cast warning
2009-07-07 13:41:51 -07:00
Brian Behlendorf
361e0e7685
Fix newly introduced missing braces warnings for gcc.
2009-07-07 13:40:16 -07:00
Brian Behlendorf
ee92267c38
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-07 13:20:40 -07:00
Brian Behlendorf
9661d38088
Add topic branch to conditionally remove idmap support. The
...
only things currently like this on linux appears in the nfs v4
implementation of idmap. For now we can do with out.
2009-07-07 13:16:24 -07:00
Brian Behlendorf
a6b1465e30
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
...
Conflicts:
module/zfs/include/sys/zfs_fuid.h
module/zfs/zfs_fuid.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_vfsops.c
module/zfs/zfs_znode.c
2009-07-06 15:16:54 -07:00