fb35fe3bc1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-06-14 15:51:56 -07:00
953aa00176
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-06-14 15:51:51 -07:00
5fa2cb516b
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-06-14 15:51:50 -07:00
696ec7fb61
Update gcc-missing-braces based on structure changes
...
Almost exclusively this patch handled the addition of another char
array to the zfs_cmd_t structure. Unfortunately c90 doesn't allow
zero filling the entire struct with the '= { 0 };' shorthand.
2010-06-14 15:44:06 -07:00
b41143632b
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
...
Conflicts:
cmd/zpool/zpool_main.c
cmd/zpool/zpool_vdev.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
lib/libzpool/include/sys/zfs_context.h
module/zcommon/include/sys/fs/zfs.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_send.c
module/zfs/dmu_tx.c
module/zfs/dsl_dataset.c
module/zfs/dsl_dir.c
module/zfs/dsl_scrub.c
module/zfs/fm.c
module/zfs/include/sys/dmu.h
module/zfs/include/sys/fm/fs/zfs.h
module/zfs/include/sys/fm/protocol.h
module/zfs/include/sys/spa.h
module/zfs/include/sys/zfs_context.h
module/zfs/include/sys/zfs_ioctl.h
module/zfs/include/sys/zvol.h
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/spa_history.c
module/zfs/spa_misc.c
module/zfs/txg.c
module/zfs/vdev.c
module/zfs/zfs_fm.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zfs_znode.c
module/zfs/zil.c
module/zfs/zio.c
2010-05-28 22:14:39 -07:00
e27754d9e8
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
...
Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
module/zfs/spa_history.c
2010-05-28 15:45:38 -07:00
3e2be634a5
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
...
Conflicts:
cmd/zdb/zdb.c
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_main.c
cmd/zpool/zpool_util.c
cmd/ztest/ztest.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_changelist.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_zfetch.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zfs_znode.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/metaslab.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zio.c
module/zfs/zio_compress.c
2010-05-28 15:34:57 -07:00
3571832262
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
...
Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
2010-05-28 14:46:39 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
002809a885
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-28 12:42:31 -07:00
818eafca5b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-05-28 12:42:30 -07:00
c91169c7c5
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
...
Conflicts:
lib/libzfs/libzfs_util.c
2010-05-28 12:42:27 -07:00
fb72c6ef81
Revert gcc-shadow using -Wno-shadow I can live with
...
While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts. Anyway, this ends up being
more simply gratutous change than I care for.
2010-05-28 12:34:45 -07:00
2feb4008e6
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-11-20 12:12:33 -08:00
aebe6818a9
Linux ZVOL implementation; user-side changes
...
At last a useful user space interface for the Linux ZFS port arrives.
With the addition of the ZVOL real ZFS based block devices are available
and can be compared head to head with Linux's MD and LVM block drivers.
The Linux ZVOL has not yet had any performance work done but from a user
perspective it should be functionally complete and behave like any other
Linux block device.
The ZVOL has so far been tested using zconfig.sh on the following x86_64
based platforms: FC11, CHAOS4, RHEL5, RHEL6, and SLES11. However, more
testing is required to ensure everything is working as designed.
What follows in a somewhat detailed list of changes includes in this
commit to make ZVOL's possible. A few other issues were addressed in
the context of these changes which will also be mentioned.
* zvol_create_link_common() simplified to simply issue to ioctl to
create the device and then wait up to 10 seconds for it to appear.
The device will be created within a few miliseconds by udev under
/dev/<pool>/<volume>. Note this naming convention is slightly
different than on Solaris by I feel is more Linuxy.
* Removed support for dump vdevs. This concept is specific to Solaris
and done not map cleanly to Linux. Under Linux generating system cores
is perferably done over the network via netdump, or alternately to a
block device via O_DIRECT.
2009-11-20 12:00:08 -08:00
e576375b9f
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-11-15 16:11:05 -08:00
e588ef08cb
Revert contents of linux-have-zpl topic branch.
2009-11-15 16:06:10 -08:00
d876a087ff
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-11-15 15:58:22 -08:00
b38252d3ec
Revert contents of linux-have-zvol topic branch.
2009-11-15 15:52:29 -08:00
1365576b3e
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-18 14:22:24 -07:00
bc611acf53
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-18 14:20:35 -07:00
147adbe815
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-18 14:18:40 -07:00
5d83878f46
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 14:18:34 -07:00
e134b976b6
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-08-18 14:18:33 -07:00
b29c1f87a0
Required build 121 updates for gcc-missing-braces
2009-08-18 14:08:46 -07:00
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
b3561355b8
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-18 12:33:54 -07:00
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
b99b422796
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-08-18 12:08:58 -07:00
41b297a27f
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-08-18 12:08:46 -07:00
db89339134
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
...
Conflicts:
module/zfs/dmu.c
2009-08-18 12:07:23 -07:00
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
45d1cae3b8
Rebase master to b121
2009-08-18 11:43:27 -07:00
dbee607bbd
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-29 21:31:26 -07:00
9cdb618921
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-29 21:29:28 -07:00
640e02d051
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-29 21:27:17 -07:00
e2bbeb5e61
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-07-29 21:27:06 -07:00
f80c505f4d
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-07-29 21:27:04 -07:00
72d2035ed3
Updated gcc in fc11 flagged a new uninitialized variable.
2009-07-29 21:17:47 -07:00
c35e61eea2
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-07-07 14:50:41 -07:00
04aa3d5ef9
Header aclutils.h only needed by idmap.
2009-07-07 14:41:19 -07:00
678b02cd8e
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-07 14:32:59 -07:00
78d7c67598
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 14:32:34 -07:00
acd26f0d75
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-07-07 14:30:34 -07:00
7c76f3ce22
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-07-07 14:28:18 -07:00
ba97ae2628
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2009-07-07 14:28:13 -07:00
ed3bd6f446
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2009-07-07 14:19:35 -07:00
798cf63309
New topic branch for minor acl related fixes
2009-07-07 14:18:47 -07:00
81729c2c73
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-07-07 14:14:24 -07:00
dd3f9c1ed4
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-07-07 14:13:57 -07:00
Brian Behlendorf