diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-11-11 00:50:35 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-11-11 00:52:14 -0800 |
| commit | c202893b8d04ed1d9504340e345e6d793cce1a11 (patch) | |
| tree | 59e2afc63423babba18a023ed59598448ec7f067 /pkgs/os-specific | |
| parent | 43be15a89cb70530a4843a1dda8a1fb5a90dc5dc (diff) | |
| download | nixlib-c202893b8d04ed1d9504340e345e6d793cce1a11.tar nixlib-c202893b8d04ed1d9504340e345e6d793cce1a11.tar.gz nixlib-c202893b8d04ed1d9504340e345e6d793cce1a11.tar.bz2 nixlib-c202893b8d04ed1d9504340e345e6d793cce1a11.tar.lz nixlib-c202893b8d04ed1d9504340e345e6d793cce1a11.tar.xz nixlib-c202893b8d04ed1d9504340e345e6d793cce1a11.tar.zst nixlib-c202893b8d04ed1d9504340e345e6d793cce1a11.zip | |
zfs: Add upstream patch bc151f7 to fix kernel 3.18 builds
Additionally, recognize that the contents of the nix-build.patch are included in the upstream tree as 3cd33ff and will be released in 0.6.4.
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/remove-lock-checks.patch | 64 |
2 files changed, 69 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 0242c586cea5..f0f260746d54 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation { sha256 = "06rrip9fxn13x6qnyp6br68r9pcygb95lld25hnnj88m2vagvg19"; }; - patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; + patches = [ + ./mount_zfs_prefix.patch + ./nix-build.patch # Remove in >=0.6.4 + ./remove-lock-checks.patch # Remove in >=0.6.4 + ]; buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ]; diff --git a/pkgs/os-specific/linux/zfs/remove-lock-checks.patch b/pkgs/os-specific/linux/zfs/remove-lock-checks.patch new file mode 100644 index 000000000000..1261b49ee1d4 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/remove-lock-checks.patch @@ -0,0 +1,64 @@ +diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c +index 33f9e0e..2f55e56 100644 +--- a/module/zfs/zfs_vnops.c ++++ b/module/zfs/zfs_vnops.c +@@ -474,15 +474,6 @@ zfs_read(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) + } + + /* +- * Check for mandatory locks +- */ +- if (mandatory_lock(ip) && +- !lock_may_read(ip, uio->uio_loffset, uio->uio_resid)) { +- ZFS_EXIT(zsb); +- return (SET_ERROR(EAGAIN)); +- } +- +- /* + * If we're in FRSYNC mode, sync out this znode before reading it. + */ + if (ioflag & FRSYNC || zsb->z_os->os_sync == ZFS_SYNC_ALWAYS) +@@ -651,15 +642,6 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) + } + + /* +- * Check for mandatory locks before calling zfs_range_lock() +- * in order to prevent a deadlock with locks set via fcntl(). +- */ +- if (mandatory_lock(ip) && !lock_may_write(ip, woff, n)) { +- ZFS_EXIT(zsb); +- return (SET_ERROR(EAGAIN)); +- } +- +- /* + * Pre-fault the pages to ensure slow (eg NFS) pages + * don't hold up txg. + * Skip this if uio contains loaned arc_buf. +diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c +index 90dbfd3..f02c021 100644 +--- a/module/zfs/zfs_znode.c ++++ b/module/zfs/zfs_znode.c +@@ -1546,7 +1546,6 @@ zfs_trunc(znode_t *zp, uint64_t end) + int + zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) + { +- struct inode *ip = ZTOI(zp); + dmu_tx_t *tx; + zfs_sb_t *zsb = ZTOZSB(zp); + zilog_t *zilog = zsb->z_log; +@@ -1567,15 +1566,6 @@ zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) + goto out; + } + +- /* +- * Check for any locks in the region to be freed. +- */ +- if (ip->i_flock && mandatory_lock(ip)) { +- uint64_t length = (len ? len : zp->z_size - off); +- if (!lock_may_write(ip, off, length)) +- return (SET_ERROR(EAGAIN)); +- } +- + if (len == 0) { + error = zfs_trunc(zp, off); + } else { |