Deleted Added
full compact
ffs_softdep.c (111463) ffs_softdep.c (111748)
1/*
2 * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
3 *
4 * The soft updates code is derived from the appendix of a University
5 * of Michigan technical report (Gregory R. Ganger and Yale N. Patt,
6 * "Soft Updates: A Solution to the Metadata Update Problem in File
7 * Systems", CSE-TR-254-95, August 1995).
8 *

--- 25 unchanged lines hidden (view full) ---

34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * from: @(#)ffs_softdep.c 9.59 (McKusick) 6/21/00
39 */
40
41#include <sys/cdefs.h>
1/*
2 * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
3 *
4 * The soft updates code is derived from the appendix of a University
5 * of Michigan technical report (Gregory R. Ganger and Yale N. Patt,
6 * "Soft Updates: A Solution to the Metadata Update Problem in File
7 * Systems", CSE-TR-254-95, August 1995).
8 *

--- 25 unchanged lines hidden (view full) ---

34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * from: @(#)ffs_softdep.c 9.59 (McKusick) 6/21/00
39 */
40
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_softdep.c 111463 2003-02-25 03:37:48Z jeff $");
42__FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_softdep.c 111748 2003-03-02 16:54:40Z des $");
43
44/*
45 * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide.
46 */
47#ifndef DIAGNOSTIC
48#define DIAGNOSTIC
49#endif
50#ifndef DEBUG

--- 332 unchanged lines hidden (view full) ---

383
384 if (semap->value++ > 0) {
385 if (interlock != NULL) {
386 interlocked_sleep(interlock, SLEEP, (caddr_t)semap,
387 NULL, semap->prio, semap->name,
388 semap->timo);
389 FREE_LOCK(interlock);
390 } else {
43
44/*
45 * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide.
46 */
47#ifndef DIAGNOSTIC
48#define DIAGNOSTIC
49#endif
50#ifndef DEBUG

--- 332 unchanged lines hidden (view full) ---

383
384 if (semap->value++ > 0) {
385 if (interlock != NULL) {
386 interlocked_sleep(interlock, SLEEP, (caddr_t)semap,
387 NULL, semap->prio, semap->name,
388 semap->timo);
389 FREE_LOCK(interlock);
390 } else {
391 tsleep((caddr_t)semap, semap->prio, semap->name,
391 tsleep(semap, semap->prio, semap->name,
392 semap->timo);
393 }
394 return (0);
395 }
396 semap->holder = curthread;
397 if (interlock != NULL)
398 FREE_LOCK(interlock);
399 return (1);

--- 5490 unchanged lines hidden ---
392 semap->timo);
393 }
394 return (0);
395 }
396 semap->holder = curthread;
397 if (interlock != NULL)
398 FREE_LOCK(interlock);
399 return (1);

--- 5490 unchanged lines hidden ---