| zfs_main.c (249643) | zfs_main.c (252764) |
|---|---|
| 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 14 unchanged lines hidden (view full) --- 23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 24 * Copyright 2012 Nexenta Systems, Inc. All rights reserved. 25 * Copyright (c) 2012 by Delphix. All rights reserved. 26 * Copyright 2012 Milan Jurik. All rights reserved. 27 * Copyright (c) 2012, Joyent, Inc. All rights reserved. 28 * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. 29 * All rights reserved. 30 * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 14 unchanged lines hidden (view full) --- 23 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 24 * Copyright 2012 Nexenta Systems, Inc. All rights reserved. 25 * Copyright (c) 2012 by Delphix. All rights reserved. 26 * Copyright 2012 Milan Jurik. All rights reserved. 27 * Copyright (c) 2012, Joyent, Inc. All rights reserved. 28 * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. 29 * All rights reserved. 30 * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. |
| 31 * Copyright (c) 2013 Steven Hartland. All rights reserved. |
|
| 31 */ 32 33#include <assert.h> 34#include <ctype.h> 35#include <errno.h> 36#include <libgen.h> 37#include <libintl.h> 38#include <libuutil.h> --- 5178 unchanged lines hidden (view full) --- 5217 5218 zhp = zfs_open(g_zfs, parent, 5219 ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME); 5220 if (zhp == NULL) { 5221 ++errors; 5222 continue; 5223 } 5224 if (holding) { | 32 */ 33 34#include <assert.h> 35#include <ctype.h> 36#include <errno.h> 37#include <libgen.h> 38#include <libintl.h> 39#include <libuutil.h> --- 5178 unchanged lines hidden (view full) --- 5218 5219 zhp = zfs_open(g_zfs, parent, 5220 ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME); 5221 if (zhp == NULL) { 5222 ++errors; 5223 continue; 5224 } 5225 if (holding) { |
| 5225 if (zfs_hold(zhp, delim+1, tag, recursive, 5226 B_FALSE, -1) != 0) | 5226 if (zfs_hold(zhp, delim+1, tag, recursive, -1) != 0) |
| 5227 ++errors; 5228 } else { 5229 if (zfs_release(zhp, delim+1, tag, recursive) != 0) 5230 ++errors; 5231 } 5232 zfs_close(zhp); 5233 } 5234 --- 1513 unchanged lines hidden --- | 5227 ++errors; 5228 } else { 5229 if (zfs_release(zhp, delim+1, tag, recursive) != 0) 5230 ++errors; 5231 } 5232 zfs_close(zhp); 5233 } 5234 --- 1513 unchanged lines hidden --- |