| zfs_ioctl.c (197289) | zfs_ioctl.c (197351) |
|---|---|
| 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 --- 2340 unchanged lines hidden (view full) --- 2349 if (zfsvfs != NULL) { 2350 char osname[MAXNAMELEN]; 2351 int mode; 2352 2353 error = zfs_suspend_fs(zfsvfs, osname, &mode); 2354 if (error == 0) { 2355 int resume_err; 2356 | 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 --- 2340 unchanged lines hidden (view full) --- 2349 if (zfsvfs != NULL) { 2350 char osname[MAXNAMELEN]; 2351 int mode; 2352 2353 error = zfs_suspend_fs(zfsvfs, osname, &mode); 2354 if (error == 0) { 2355 int resume_err; 2356 |
| 2357#ifdef FREEBSD_NAMECACHE 2358 cache_purgevfs(zfsvfs->z_vfs); 2359#endif | |
| 2360 ASSERT(strcmp(osname, zc->zc_name) == 0); 2361 error = dmu_objset_rollback(os); 2362 resume_err = zfs_resume_fs(zfsvfs, osname, mode); 2363 error = error ? error : resume_err; 2364 } else { 2365 dmu_objset_close(os); 2366 } 2367 VFS_RELE(zfsvfs->z_vfs); --- 170 unchanged lines hidden (view full) --- 2538 char osname[MAXNAMELEN]; 2539 int mode; 2540 2541 /* online recv */ 2542 error = zfs_suspend_fs(zfsvfs, osname, &mode); 2543 if (error == 0) { 2544 int resume_err; 2545 | 2357 ASSERT(strcmp(osname, zc->zc_name) == 0); 2358 error = dmu_objset_rollback(os); 2359 resume_err = zfs_resume_fs(zfsvfs, osname, mode); 2360 error = error ? error : resume_err; 2361 } else { 2362 dmu_objset_close(os); 2363 } 2364 VFS_RELE(zfsvfs->z_vfs); --- 170 unchanged lines hidden (view full) --- 2535 char osname[MAXNAMELEN]; 2536 int mode; 2537 2538 /* online recv */ 2539 error = zfs_suspend_fs(zfsvfs, osname, &mode); 2540 if (error == 0) { 2541 int resume_err; 2542 |
| 2546#ifdef FREEBSD_NAMECACHE 2547 cache_purgevfs(zfsvfs->z_vfs); 2548#endif | |
| 2549 error = dmu_recv_end(&drc); 2550 resume_err = zfs_resume_fs(zfsvfs, osname, mode); 2551 error = error ? error : resume_err; 2552 } else { 2553 dmu_recv_abort_cleanup(&drc); 2554 } 2555 } else if (error == 0) { 2556 error = dmu_recv_end(&drc); --- 571 unchanged lines hidden --- | 2543 error = dmu_recv_end(&drc); 2544 resume_err = zfs_resume_fs(zfsvfs, osname, mode); 2545 error = error ? error : resume_err; 2546 } else { 2547 dmu_recv_abort_cleanup(&drc); 2548 } 2549 } else if (error == 0) { 2550 error = dmu_recv_end(&drc); --- 571 unchanged lines hidden --- |