diff options
author | Renato Botelho <renato@netgate.com> | 2015-12-14 11:12:41 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-12-14 11:12:41 -0200 |
commit | 6edad5be89050ac3cfa5512ddceca99affe9ad8a (patch) | |
tree | 2c88bc0aac442001b8a020f1b41cfce5c79b4959 /share/man/man9 | |
parent | 1b7c02947f339bceaede5ea0a8aa91cb00b44eb3 (diff) | |
parent | 98e6718d915fa5a645555a7bf1f41f75c5b53107 (diff) | |
download | FreeBSD-src-6edad5be89050ac3cfa5512ddceca99affe9ad8a.zip FreeBSD-src-6edad5be89050ac3cfa5512ddceca99affe9ad8a.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'share/man/man9')
-rw-r--r-- | share/man/man9/Makefile | 1 | ||||
-rw-r--r-- | share/man/man9/g_bio.9 | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index ec6c699..a6a13fd 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -889,6 +889,7 @@ MLINKS+=\ mbuf.9 m_cat.9 \ mbuf.9 MCHTYPE.9 \ mbuf.9 MCLGET.9 \ + mbuf.9 m_collapse.9 \ mbuf.9 m_copyback.9 \ mbuf.9 m_copydata.9 \ mbuf.9 m_copym.9 \ diff --git a/share/man/man9/g_bio.9 b/share/man/man9/g_bio.9 index e7351b8..76f7611 100644 --- a/share/man/man9/g_bio.9 +++ b/share/man/man9/g_bio.9 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 1, 2006 +.Dd December 7, 2015 .Dt G_BIO 9 .Os .Sh NAME @@ -253,7 +253,7 @@ example_start(struct bio *bp) /* Ok, schedule it down. */ /* * The consumer can be obtained from - * LIST_FIRST(&bp->bio_to->geom->consumers) as well, + * LIST_FIRST(&bp->bio_to->geom->consumer) as well, * if there is only one in our geom. */ g_io_request(cbp, sc->ex_consumer); |