https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=193803
--- Comment #17 from Steven Hartland <[email protected]> --- (In reply to kash from comment #16) > The patch does not apply cleanly to a new SVN pull of releng/10.0: Just retested here against a clean checkout and it does apply for me without issue. Are you sure your checkout is clean? smh> svn info Path: . Working Copy Root Path: freebsd/base/releng/10.0 URL: svn+ssh://svn.freebsd.org/base/releng/10.0 Relative URL: ^/releng/10.0 Repository Root: svn+ssh://svn.freebsd.org/base Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f Revision: 272442 Node Kind: directory Schedule: normal Last Changed Author: delphij Last Changed Rev: 271669 Last Changed Date: 2014-09-16 09:50:19 +0000 (Tue, 16 Sep 2014) smh> svn status smh> root@node-dev:src-svn> patch -C -E -N -p0 -F1 -t < /usr/src/patches/zfs-zvol-fixes.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Various fixes for zvol devices not being correctly maintained when operations |which effect them occur. |--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c.orig 2014-03-26 17:52:33.000000000 +0000 |+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c 2014-09-29 18:52:24.903520480 +0000 -------------------------- Patching file sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c using Plan A... Hunk #1 succeeded at 1655. Hunk #2 succeeded at 1684. Hunk #3 succeeded at 1696. Hunk #4 succeeded at 2072. Hunk #5 succeeded at 2140. Hunk #6 succeeded at 2180. Hunk #7 succeeded at 2223. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h.orig 2014-03-26 17:52:33.000000000 +0000 |+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h 2014-09-29 18:52:24.903520480 +0000 -------------------------- Patching file sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h using Plan A... Hunk #1 succeeded at 41. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c.orig 2014-03-26 17:52:33.000000000 +0000 |+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c 2014-09-29 18:52:24.908521871 +0000 -------------------------- Patching file sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c using Plan A... Hunk #1 succeeded at 3517. Hunk #2 succeeded at 3547. Hunk #3 succeeded at 3643. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c.orig 2014-09-29 18:52:05.348521778 +0000 |+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c 2014-09-29 18:52:24.909520935 +0000 -------------------------- Patching file sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c using Plan A... Hunk #1 succeeded at 630. Hunk #2 succeeded at 757. Hunk #3 succeeded at 782. Hunk #4 succeeded at 2369 (offset -12 lines). Hunk #5 succeeded at 2467 (offset -1 lines). No such line 2505 in input file, ignoring Hunk #6 succeeded at 2488 (offset -12 lines). done -- You are receiving this mail because: You are the assignee for the bug. _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "[email protected]"
