Advertisement
Guest User

Untitled

a guest
Sep 4th, 2015
82
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.31 KB | None | 0 0
  1. bash-4.3$ surfake zfs/ zfs2/ | grep -v Makefile.am | grep -v git
  2. sending incremental file list
  3. >fc.T....... META
  4. >fcsT....... module/zfs/arc.c
  5. >fcsT....... module/zfs/zfs_vnops_osx.c
  6.  
  7. sent 34.55K bytes received 211 bytes 69.53K bytes/sec
  8. total size is 43.74M speedup is 1,258.10 (DRY RUN)
  9. bash-4.3$ diff zfs/module/zfs/arc.c zfs2/module/zfs/arc.c
  10. 3962,3964c3962,3967
  11. <
  12. < /* set max to 1/4 of all memory */
  13. < arc_c_max = arc_c * 2;
  14. ---
  15. > /* set max to 1/4 of all memory, or all but 3GB, whichever is more */
  16. > if (arc_c * 8 >= (3ULL << 30)) {
  17. > arc_c_max = (arc_c * 8) - (3ULL << 30);
  18. > } else
  19. > arc_c_max = arc_c_min;
  20. > arc_c_max = MAX(arc_c * 2, arc_c_max);
  21. bash-4.3$ diff zfs/module/zfs/zfs_vnops_osx.c zfs2/module/zfs/zfs_vnops_osx.c
  22. 331c331
  23. < error ? "" : bufptr);
  24. ---
  25. > error ? "" : bufptr);
  26. 341c341
  27. < dprintf("ZFS: HFS_TRANSFER_DOCUMENT_ID:\n");
  28. ---
  29. > printf("ZFS: HFS_TRANSFER_DOCUMENT_ID:\n");
  30. 366c366
  31. < dprintf("ZFS: source is not TRACKED\n");
  32. ---
  33. > printf("ZFS: source is not TRACKED\n");
  34. 370c370
  35. < dprintf("ZFS: destination is already TRACKED\n");
  36. ---
  37. > printf("ZFS: destination is already TRACKED\n");
  38. 389c389
  39. < dprintf("ZFS: Moved docid %u from id %llu to id %llu\n",
  40. ---
  41. > printf("ZFS: Moved docid %u from id %llu to id %llu\n",
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement