Module Name: src
Committed By: dyoung
Date: Wed May 20 03:26:21 UTC 2009
Modified Files:
src/sys/dev/ata: wd.c
src/sys/dev/scsipi: sd.c
src/sys/kern: subr_disk.c
src/sys/sys: disk.h
Log Message:
On second thought, let's call disk_predetach() disk_begindetach().
Verbs are good.
To generate a diff of this commit:
cvs rdiff -u -r1.376 -r1.377 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.285 -r1.286 src/sys/dev/scsipi/sd.c
cvs rdiff -u -r1.96 -r1.97 src/sys/kern/subr_disk.c
cvs rdiff -u -r1.53 -r1.54 src/sys/sys/disk.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.376 src/sys/dev/ata/wd.c:1.377
--- src/sys/dev/ata/wd.c:1.376 Tue May 19 23:43:44 2009
+++ src/sys/dev/ata/wd.c Wed May 20 03:26:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.376 2009/05/19 23:43:44 dyoung Exp $ */
+/* $NetBSD: wd.c,v 1.377 2009/05/20 03:26:21 dyoung Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.376 2009/05/19 23:43:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.377 2009/05/20 03:26:21 dyoung Exp $");
#include "opt_ata.h"
@@ -439,7 +439,7 @@
struct wd_softc *sc = device_private(self);
int bmaj, cmaj, i, mn, rc, s;
- if ((rc = disk_predetach(&sc->sc_dk, wdlastclose, self, flags)) != 0)
+ if ((rc = disk_begindetach(&sc->sc_dk, wdlastclose, self, flags)) != 0)
return rc;
/* locate the major number */
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.285 src/sys/dev/scsipi/sd.c:1.286
--- src/sys/dev/scsipi/sd.c:1.285 Tue May 19 23:43:44 2009
+++ src/sys/dev/scsipi/sd.c Wed May 20 03:26:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.285 2009/05/19 23:43:44 dyoung Exp $ */
+/* $NetBSD: sd.c,v 1.286 2009/05/20 03:26:21 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.285 2009/05/19 23:43:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.286 2009/05/20 03:26:21 dyoung Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -332,7 +332,7 @@
struct sd_softc *sd = device_private(self);
int s, bmaj, cmaj, i, mn, rc;
- if ((rc = disk_predetach(&sd->sc_dk, sdlastclose, self, flags)) != 0)
+ if ((rc = disk_begindetach(&sd->sc_dk, sdlastclose, self, flags)) != 0)
return rc;
/* locate the major number */
Index: src/sys/kern/subr_disk.c
diff -u src/sys/kern/subr_disk.c:1.96 src/sys/kern/subr_disk.c:1.97
--- src/sys/kern/subr_disk.c:1.96 Tue May 19 23:42:05 2009
+++ src/sys/kern/subr_disk.c Wed May 20 03:26:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.96 2009/05/19 23:42:05 dyoung Exp $ */
+/* $NetBSD: subr_disk.c,v 1.97 2009/05/20 03:26:21 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.96 2009/05/19 23:42:05 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.97 2009/05/20 03:26:21 dyoung Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -217,7 +217,7 @@
}
int
-disk_predetach(struct disk *dk, int (*lastclose)(device_t),
+disk_begindetach(struct disk *dk, int (*lastclose)(device_t),
device_t self, int flags)
{
int rc;
Index: src/sys/sys/disk.h
diff -u src/sys/sys/disk.h:1.53 src/sys/sys/disk.h:1.54
--- src/sys/sys/disk.h:1.53 Tue May 19 23:42:05 2009
+++ src/sys/sys/disk.h Wed May 20 03:26:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: disk.h,v 1.53 2009/05/19 23:42:05 dyoung Exp $ */
+/* $NetBSD: disk.h,v 1.54 2009/05/20 03:26:21 dyoung Exp $ */
/*-
* Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
@@ -497,7 +497,7 @@
struct proc;
void disk_attach(struct disk *);
-int disk_predetach(struct disk *, int (*)(device_t), device_t, int);
+int disk_begindetach(struct disk *, int (*)(device_t), device_t, int);
void disk_detach(struct disk *);
void disk_init(struct disk *, const char *, const struct dkdriver *);
void disk_destroy(struct disk *);
