[Glibc-bsd-commits] r3270 - in trunk/zfsutils/debian: . patches
Petr Salinger
ps-guest at alioth.debian.org
Thu Feb 17 10:05:37 UTC 2011
Author: ps-guest
Date: 2011-02-17 10:05:33 +0000 (Thu, 17 Feb 2011)
New Revision: 3270
Added:
trunk/zfsutils/debian/patches/13_mnttab.diff
Modified:
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/patches/03_glibc_namespace.diff
trunk/zfsutils/debian/patches/07_manpages.diff
trunk/zfsutils/debian/patches/08_libbsd.diff
trunk/zfsutils/debian/patches/12_freebsd.diff
trunk/zfsutils/debian/patches/series
Log:
zfsutils based on 8.2
Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog 2011-02-17 09:26:55 UTC (rev 3269)
+++ trunk/zfsutils/debian/changelog 2011-02-17 10:05:33 UTC (rev 3270)
@@ -1,3 +1,10 @@
+zfsutils (8.2-1) UNRELEASED; urgency=low
+
+ [ Petr Salinger ]
+ * Based on FreeBSD 8.2.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Thu, 02 Sep 2010 01:41:20 +0200
+
zfsutils (8.1-4) unstable; urgency=low
* Create a /boot/zfs/ directory in zfsutils-udeb, so that zpool.cache
Modified: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2011-02-17 09:26:55 UTC (rev 3269)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2011-02-17 10:05:33 UTC (rev 3270)
@@ -1,6 +1,5 @@
-diff -ur -x debian a/cddl/compat/opensolaris/include/solaris.h b/cddl/compat/opensolaris/include/solaris.h
---- a/cddl/compat/opensolaris/include/solaris.h 2008-04-22 03:43:00.000000000 -0400
-+++ b/cddl/compat/opensolaris/include/solaris.h 2010-07-27 20:09:52.788482289 -0400
+--- a/cddl/compat/opensolaris/include/solaris.h
++++ b/cddl/compat/opensolaris/include/solaris.h
@@ -5,6 +5,9 @@
#include <sys/ccompile.h>
@@ -11,9 +10,8 @@
+#endif
#endif /* !_SOLARIS_H_ */
-diff -ur -x debian a/cddl/compat/opensolaris/misc/fsshare.c b/cddl/compat/opensolaris/misc/fsshare.c
---- a/cddl/compat/opensolaris/misc/fsshare.c 2008-03-28 18:16:18.000000000 -0400
-+++ b/cddl/compat/opensolaris/misc/fsshare.c 2010-07-27 20:09:52.789492219 -0400
+--- a/cddl/compat/opensolaris/misc/fsshare.c
++++ b/cddl/compat/opensolaris/misc/fsshare.c
@@ -28,6 +28,7 @@
__FBSDID("$FreeBSD$");
@@ -22,7 +20,7 @@
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
-@@ -67,7 +67,7 @@
+@@ -67,7 +68,7 @@
* mountpoint specified in the 'skip' argument.
*/
static char *
@@ -31,7 +29,7 @@
{
static char line[MAXLINESIZE];
size_t len, skiplen;
-@@ -198,7 +198,7 @@
+@@ -198,7 +199,7 @@
/* Place big, fat warning at the begining of the file. */
fprintf(newfd, "%s", FILE_HEADER);
@@ -40,18 +38,9 @@
fprintf(newfd, "%s\n", line);
if (oldfd != NULL && ferror(oldfd) != 0) {
error = ferror(oldfd);
-diff -ur -x debian a/cddl/compat/opensolaris/misc/mnttab.c b/cddl/compat/opensolaris/misc/mnttab.c
---- a/cddl/compat/opensolaris/misc/mnttab.c 2008-11-17 15:49:29.000000000 -0500
-+++ b/cddl/compat/opensolaris/misc/mnttab.c 2010-07-27 20:09:52.790512709 -0400
-@@ -36,6 +36,7 @@
- #include <sys/mount.h>
- #include <sys/mntent.h>
- #include <sys/mnttab.h>
-+#include <ctype.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -63,7 +63,7 @@
+--- a/cddl/compat/opensolaris/misc/mnttab.c
++++ b/cddl/compat/opensolaris/misc/mnttab.c
+@@ -66,7 +66,7 @@
}
char *
@@ -60,10 +49,9 @@
{
char tmpopts[MNT_LINE_MAX];
char *f, *opts = tmpopts;
-diff -ur -x debian a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c 2008-11-17 15:49:29.000000000 -0500
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c 2010-07-27 20:09:52.798610639 -0400
-@@ -2166,11 +2166,11 @@
+--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
++++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
+@@ -1637,11 +1637,11 @@
case ZFS_PROP_NBMAND:
*val = getprop_uint64(zhp, prop, source);
@@ -77,9 +65,8 @@
*val = B_FALSE;
if (src)
*src = ZPROP_SRC_TEMPORARY;
-diff -ur -x debian a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
---- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c 2009-07-09 16:22:05.000000000 -0400
-+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c 2010-07-27 20:09:52.800641669 -0400
+--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
++++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
@@ -463,7 +463,7 @@
/*ARGSUSED*/
int
@@ -89,9 +76,8 @@
{
ssize_t iolen, split;
-diff -ur -x debian a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
---- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h 2009-07-09 16:22:05.000000000 -0400
-+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h 2010-07-27 20:09:52.802661419 -0400
+--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
++++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
@@ -105,8 +105,8 @@
#define ZFS_LOG(...) do { } while (0)
@@ -103,7 +89,7 @@
#ifdef ZFS_DEBUG
extern void dprintf_setup(int *argc, char **argv);
-@@ -438,7 +438,7 @@
+@@ -445,7 +445,7 @@
extern int vn_openat(char *path, int x1, int oflags, int mode, vnode_t **vpp,
int x2, int x3, vnode_t *vp, int fd);
extern int vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len,
@@ -112,9 +98,8 @@
extern void vn_close(vnode_t *vp, int openflag, cred_t *cr, kthread_t *td);
#define vn_remove(path, x1, x2) remove(path)
-diff -ur -x debian a/sys/cddl/compat/opensolaris/sys/dirent.h b/sys/cddl/compat/opensolaris/sys/dirent.h
---- a/sys/cddl/compat/opensolaris/sys/dirent.h 2008-03-28 18:16:18.000000000 -0400
-+++ b/sys/cddl/compat/opensolaris/sys/dirent.h 2010-07-27 20:09:52.803673879 -0400
+--- a/sys/cddl/compat/opensolaris/sys/dirent.h
++++ b/sys/cddl/compat/opensolaris/sys/dirent.h
@@ -32,7 +32,10 @@
#include_next <sys/dirent.h>
@@ -126,10 +111,9 @@
#define ino64_t ino_t
#define d_ino d_fileno
-diff -ur -x debian a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c 2009-10-12 16:36:55.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c 2010-07-27 20:09:52.816846339 -0400
-@@ -677,7 +677,7 @@
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+@@ -710,7 +710,7 @@
zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
{
znode_t *zp = VTOZ(vp);
Modified: trunk/zfsutils/debian/patches/07_manpages.diff
===================================================================
--- trunk/zfsutils/debian/patches/07_manpages.diff 2011-02-17 09:26:55 UTC (rev 3269)
+++ trunk/zfsutils/debian/patches/07_manpages.diff 2011-02-17 10:05:33 UTC (rev 3270)
@@ -1,11 +1,11 @@
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
-@@ -3,7 +3,7 @@
- .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License.
- .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License.
- .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
--.TH zfs 1M "14 Feb 2009" "SunOS 5.11" "System Administration Commands"
-+.TH zfs 8 "14 Feb 2009" "SunOS 5.11" "System Administration Commands"
+@@ -6,7 +6,7 @@
+ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
+ .\" See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
+ .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
+-.TH zfs 1M "5 May 2009" "SunOS 5.11" "System Administration Commands"
++.TH zfs 8 "5 May 2009" "SunOS 5.11" "System Administration Commands"
.SH NAME
zfs \- configures ZFS file systems
.SH SYNOPSIS
@@ -20,4 +20,3 @@
.SH NAME
zpool \- configures ZFS storage pools
.SH SYNOPSIS
-
Modified: trunk/zfsutils/debian/patches/08_libbsd.diff
===================================================================
--- trunk/zfsutils/debian/patches/08_libbsd.diff 2011-02-17 09:26:55 UTC (rev 3269)
+++ trunk/zfsutils/debian/patches/08_libbsd.diff 2011-02-17 10:05:33 UTC (rev 3270)
@@ -18,7 +18,6 @@
static uu_avl_pool_t uu_null_apool = { &uu_null_apool, &uu_null_apool };
static pthread_mutex_t uu_apool_list_lock = PTHREAD_MUTEX_INITIALIZER;
-
--- a/cddl/compat/opensolaris/misc/deviceid.c
+++ b/cddl/compat/opensolaris/misc/deviceid.c
@@ -35,6 +35,7 @@
@@ -31,7 +30,7 @@
devid_str_decode(char *devidstr, ddi_devid_t *retdevid, char **retminor_name)
--- a/cddl/compat/opensolaris/misc/mnttab.c
+++ b/cddl/compat/opensolaris/misc/mnttab.c
-@@ -39,6 +39,7 @@
+@@ -42,6 +42,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -41,14 +40,14 @@
mntopt(char **p)
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
-@@ -44,6 +44,7 @@
- #include <sys/mount.h>
- #include <sys/stat.h>
- #include <sys/avl.h>
+@@ -35,6 +35,7 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+#include <bsd/string.h>
-
- #include <libzfs.h>
- #include <libuutil.h>
+ #include <strings.h>
+ #include <unistd.h>
+ #include <fcntl.h>
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
@@ -74,6 +74,7 @@
@@ -69,19 +68,9 @@
#include <libzfs.h>
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
-@@ -44,6 +44,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <stddef.h>
-+#include <bsd/string.h>
-
- #include <sys/spa.h>
- #include <sys/zap.h>
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c
-@@ -78,6 +78,7 @@
+@@ -76,6 +76,7 @@
#include <string.h>
#include <strings.h>
#include <unistd.h>
@@ -101,8 +90,8 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
-@@ -77,6 +77,7 @@
- #include <sys/mnttab.h>
+@@ -76,6 +76,7 @@
+ #include <sys/mntent.h>
#include <sys/mount.h>
#include <sys/stat.h>
+#include <bsd/string.h>
@@ -111,9 +100,9 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-@@ -42,6 +42,7 @@
+@@ -41,6 +41,7 @@
+ #include <sys/zfs_ioctl.h>
#include <sys/zio.h>
- #include <strings.h>
#include <umem.h>
+#include <bsd/string.h>
@@ -131,7 +120,7 @@
--- a/cddl/compat/opensolaris/misc/fsshare.c
+++ b/cddl/compat/opensolaris/misc/fsshare.c
-@@ -36,6 +36,7 @@
+@@ -37,6 +37,7 @@
#include <libutil.h>
#include <assert.h>
#include <fsshare.h>
@@ -139,3 +128,13 @@
#define FILE_HEADER "# !!! DO NOT EDIT THIS FILE MANUALLY !!!\n\n"
#define OPTSSIZE 1024
+--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
++++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
+@@ -31,6 +31,7 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <bsd/string.h>
+ #include <strings.h>
+ #include <unistd.h>
+ #include <stddef.h>
Modified: trunk/zfsutils/debian/patches/12_freebsd.diff
===================================================================
--- trunk/zfsutils/debian/patches/12_freebsd.diff 2011-02-17 09:26:55 UTC (rev 3269)
+++ trunk/zfsutils/debian/patches/12_freebsd.diff 2011-02-17 10:05:33 UTC (rev 3270)
@@ -1,7 +1,6 @@
-diff -ur a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h 2010-08-13 16:14:57.000000000 -0400
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h 2010-08-13 16:32:38.000000000 -0400
-@@ -577,7 +577,7 @@
+--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
++++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
+@@ -601,7 +601,7 @@
extern int zpool_enable_datasets(zpool_handle_t *, const char *, int);
extern int zpool_disable_datasets(zpool_handle_t *, boolean_t);
@@ -10,11 +9,10 @@
extern int zmount(const char *, const char *, int, char *, char *, int, char *,
int);
#endif
-diff -ur a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h 2010-08-13 16:14:57.000000000 -0400
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h 2010-08-13 16:32:38.000000000 -0400
-@@ -188,7 +188,7 @@
- extern int zfs_unshare_proto(zfs_handle_t *zhp,
+--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
++++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
+@@ -190,7 +190,7 @@
+ extern int zfs_unshare_proto(zfs_handle_t *,
const char *, zfs_share_proto_t *);
-#ifdef __FreeBSD__
@@ -22,10 +20,9 @@
/*
* This is FreeBSD version of ioctl, because Solaris' ioctl() updates
-diff -ur a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c 2010-08-13 16:14:57.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c 2010-08-13 16:32:38.000000000 -0400
-@@ -722,7 +722,7 @@
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
+@@ -726,7 +726,7 @@
return (err);
}
@@ -34,7 +31,7 @@
int
dmu_write_pages(objset_t *os, uint64_t object, uint64_t offset, uint64_t size,
page_t *pp, dmu_tx_t *tx)
-@@ -780,7 +780,7 @@
+@@ -781,7 +781,7 @@
dmu_buf_rele_array(dbp, numbufs, FTAG);
return (err);
}
@@ -42,10 +39,9 @@
+#endif /* !__FreeBSD__ && !__FreeBSD_kernel__ */
#endif /* _KERNEL */
- typedef struct {
-diff -ur a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h 2010-08-13 16:14:57.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h 2010-08-13 16:32:38.000000000 -0400
+ /*
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
@@ -51,7 +51,7 @@
extern int zvol_open(dev_t *devp, int flag, int otyp, cred_t *cr);
extern int zvol_dump(dev_t dev, caddr_t addr, daddr_t offset, int nblocks);
@@ -55,31 +51,18 @@
extern int zvol_strategy(buf_t *bp);
extern int zvol_read(dev_t dev, uio_t *uiop, cred_t *cr);
extern int zvol_write(dev_t dev, uio_t *uiop, cred_t *cr);
-diff -ur a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c 2010-08-13 16:14:57.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c 2010-08-13 16:32:38.000000000 -0400
-@@ -2419,7 +2419,7 @@
- boolean_t
- vdev_is_bootable(vdev_t *vd)
- {
--#ifdef __FreeBSD_version
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- return (B_TRUE);
- #else
- int c;
-diff -ur a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c 2010-08-13 16:14:57.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c 2010-08-13 16:32:38.000000000 -0400
-@@ -1852,7 +1852,7 @@
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
+@@ -1878,7 +1878,7 @@
} else {
- fgid = zfs_fuid_create_cred(zfsvfs,
- ZFS_GROUP, tx, cr, fuidp);
+ acl_ids->z_fgid = zfs_fuid_create_cred(zfsvfs,
+ ZFS_GROUP, cr, &acl_ids->z_fuidp);
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- gid = fgid = parent->z_phys->zp_gid;
+ gid = acl_ids->z_fgid = dzp->z_phys->zp_gid;
#else
gid = crgetgid(cr);
-@@ -2385,7 +2385,7 @@
+@@ -2562,7 +2562,7 @@
is_attr = ((zp->z_phys->zp_flags & ZFS_XATTR) &&
(ZTOV(zp)->v_type == VDIR));
@@ -88,10 +71,9 @@
/*
* In FreeBSD, we don't care about permissions of individual ADS.
* Note that not checking them is not just an optimization - without
-diff -ur a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c 2010-08-13 16:14:57.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c 2010-08-13 16:32:38.000000000 -0400
-@@ -850,7 +850,7 @@
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
+@@ -833,7 +833,7 @@
* In FreeBSD, access checking for creating an EA is being done
* in zfs_setextattr(),
*/
@@ -100,7 +82,7 @@
if (error = zfs_zaccess(zp, ACE_WRITE_NAMED_ATTRS, 0, B_FALSE, cr))
return (error);
#endif
-@@ -929,7 +929,7 @@
+@@ -916,7 +916,7 @@
if (!(flags & CREATE_XATTR_DIR)) {
zfs_dirent_unlock(dl);
@@ -109,10 +91,9 @@
return (ENOATTR);
#else
return (ENOENT);
-diff -ur a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c 2010-08-13 16:14:57.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c 2010-08-13 16:32:38.000000000 -0400
-@@ -984,7 +984,7 @@
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
+@@ -1385,7 +1385,7 @@
rrw_exit(&zfsvfs->z_teardown_lock, FTAG);
rw_exit(&zfsvfs->z_teardown_inactive_lock);
Added: trunk/zfsutils/debian/patches/13_mnttab.diff
===================================================================
--- trunk/zfsutils/debian/patches/13_mnttab.diff (rev 0)
+++ trunk/zfsutils/debian/patches/13_mnttab.diff 2011-02-17 10:05:33 UTC (rev 3270)
@@ -0,0 +1,11 @@
+--- a/cddl/compat/opensolaris/include/mnttab.h
++++ b/cddl/compat/opensolaris/include/mnttab.h
+@@ -9,7 +9,7 @@
+ #include <stdio.h>
+ #include <paths.h>
+
+-#define MNTTAB _PATH_DEVZERO
++#define MNTTAB _PATH_MNTTAB
+ #define MNT_LINE_MAX 1024
+
+ #define umount2(p, f) unmount(p, f)
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2011-02-17 09:26:55 UTC (rev 3269)
+++ trunk/zfsutils/debian/patches/series 2011-02-17 10:05:33 UTC (rev 3270)
@@ -10,3 +10,4 @@
10_zpool_import.diff
11_endian.diff
12_freebsd.diff
+13_mnttab.diff
More information about the Glibc-bsd-commits
mailing list