Print this page
6198 Let's EOL cachefs
*** 25,35 ****
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
/*
! * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
*/
#include <stdio.h>
#include <stdio_ext.h>
#include <limits.h>
--- 25,35 ----
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
/*
! * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
*/
#include <stdio.h>
#include <stdio_ext.h>
#include <limits.h>
*** 137,155 ****
int lofsfail; /* count of failures of lofs mounts */
int exitcode;
int aflg, cflg, fflg, Fflg, gflg, oflg, pflg, rflg, vflg, Vflg, mflg, Oflg,
dashflg, questflg, dflg, qflg;
- /*
- * Currently, mounting cachefs instances simultaneously uncovers various
- * problems. For the short term, we serialize cachefs activity while we fix
- * these cachefs bugs.
- */
- #define CACHEFS_BUG
- #ifdef CACHEFS_BUG
- int cachefs_running; /* parallel cachefs not supported yet */
- #endif
/*
* Each vfsent_t describes a vfstab entry. It is used to manage and cleanup
* each child that performs the particular mount for the entry.
*/
--- 137,146 ----
*** 1293,1311 ****
;
while (nrun >= maxrun && (dowait() != -1)) /* throttle */
;
- #ifdef CACHEFS_BUG
- if (vp->v.vfs_fstype &&
- (strcmp(vp->v.vfs_fstype, "cachefs") == 0)) {
- while (cachefs_running && (dowait() != -1))
- ;
- cachefs_running = 1;
- }
- #endif
-
if ((child = fork()) == -1) {
perror("fork");
cleanup(-1);
/* not reached */
}
--- 1284,1293 ----
*** 1472,1486 ****
lofscnt--;
if (ret)
lofsfail++;
}
- #ifdef CACHEFS_BUG
- if (vp->v.vfs_fstype && (strcmp(vp->v.vfs_fstype, "cachefs") == 0))
- cachefs_running = 0;
- #endif
-
vp->exitcode = ret;
return (ret);
}
--- 1454,1463 ----