Re: svn commit: r220983 - head
On Tue, Apr 26, 2011 at 09:17:04PM -0600, Warner Losh wrote: It's not difficult to add -- the issue is that the mechanism is unreliable. It doesn't work for all partition types supporting labels, it's hard to figure out what the name of the label provider is in a generic way, and the label providers have a nasty habit of disappearing periodically when you use the underlying provider for anything. Also, retastes don't always work. For example, if I change the label of a GPT partition, the label provider does not reflect the change until a disk reattach (e.g. a reboot). I know that for ufs, it works well, except for the root partition which requires some dancing to retrofit. But if you relabel a partition, it shows up right away in /dev/ufs/newlbl. Guess not all of them are that reliable. The new names, and slightly non-deterministic probe order make it more important that we shake out the bugs from this as best we can. I think that names/uuid are critical to the future, and we need to fix any remaining issues. Labels are kinda tricky and they differ. For example UFS labels or IDs don't play with tasting well (they were never designed to play well with such mechanism). You can create file system that is smaller than underlying provider (newfs -s). How do we know that label is assigned to the provider we are tasing and not to some other provider? Currently we check that based on recorded file system size and provider size, so we won't create label/id on ad0s1 instead of ad0s1a, but because of this we won't create label/id at all if file system was created with the -s option. GPT labels and IDs should be implemented as part of GPART class and not GLABEL. Currently if you modify GPT label for a partition in ad0 there is no write to, eg. ad0p1, so there is no taste event which allows glabel to detect the change, so the label is not updated in /dev/gpt/. There is a patch on freebsd-geom@ to move GPT labels/IDs to GPART. -- Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://yomoli.com pgpODQRCVUyob.pgp Description: PGP signature
Re: svn commit: r221101 - in head/sys/geom: . concat journal mirror raid3 shsec stripe virstor
On Apr 27, 2011, at 12:10 AM, Alexander Motin wrote: Hi Alexander, Author: mav Date: Wed Apr 27 00:10:26 2011 New Revision: 221101 URL: http://svn.freebsd.org/changeset/base/221101 Log: Implement relaxed comparision for hardcoded provider names to make it ignore adX/adaY difference in both directions to simplify migration to the CAM-based ATA or back. Thanks a lot for this and the earlier changes in such a quick time. Very much appreciated! I'll try to test them as good as I can over the next weeks and am happy this got sorted:) Bjoern -- Bjoern A. Zeeb You have to have visions! Stop bit received. Insert coin for new address family. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221101 - in head/sys/geom: . concat journal mirror raid3 shsec stripe virstor
On Wed, Apr 27, 2011 at 12:10:26AM +, Alexander Motin wrote:
Author: mav
Date: Wed Apr 27 00:10:26 2011
New Revision: 221101
URL: http://svn.freebsd.org/changeset/base/221101
Log:
Implement relaxed comparision for hardcoded provider names to make it
ignore adX/adaY difference in both directions to simplify migration to
the CAM-based ATA or back.
Modified:
head/sys/geom/concat/g_concat.c
head/sys/geom/geom.h
head/sys/geom/geom_subr.c
head/sys/geom/journal/g_journal.c
head/sys/geom/mirror/g_mirror.c
head/sys/geom/raid3/g_raid3.c
head/sys/geom/shsec/g_shsec.c
head/sys/geom/stripe/g_stripe.c
head/sys/geom/virstor/g_virstor.c
Modified: head/sys/geom/concat/g_concat.c
==
--- head/sys/geom/concat/g_concat.c Tue Apr 26 23:00:32 2011
(r221100)
+++ head/sys/geom/concat/g_concat.c Wed Apr 27 00:10:26 2011
(r221101)
@@ -678,7 +678,8 @@ g_concat_taste(struct g_class *mp, struc
if (md.md_version 4)
md.md_provsize = pp-mediasize;
- if (md.md_provider[0] != '\0' strcmp(md.md_provider, pp-name) != 0)
+ if (md.md_provider[0] != '\0'
+ !g_compare_names(md.md_provider, pp-name))
return (NULL);
if (md.md_provsize != pp-mediasize)
return (NULL);
Modified: head/sys/geom/geom.h
==
--- head/sys/geom/geom.h Tue Apr 26 23:00:32 2011(r221100)
+++ head/sys/geom/geom.h Wed Apr 27 00:10:26 2011(r221101)
@@ -238,6 +238,7 @@ void g_waitidlelock(void);
/* geom_subr.c */
int g_access(struct g_consumer *cp, int nread, int nwrite, int nexcl);
int g_attach(struct g_consumer *cp, struct g_provider *pp);
+int g_compare_names(const char *namea, const char *nameb);
void g_destroy_consumer(struct g_consumer *cp);
void g_destroy_geom(struct g_geom *pp);
void g_destroy_provider(struct g_provider *pp);
Modified: head/sys/geom/geom_subr.c
==
--- head/sys/geom/geom_subr.c Tue Apr 26 23:00:32 2011(r221100)
+++ head/sys/geom/geom_subr.c Wed Apr 27 00:10:26 2011(r221101)
@@ -1017,6 +1017,43 @@ g_getattr__(const char *attr, struct g_c
return (0);
}
+static int
+g_get_device_prefix_len(const char *name)
+{
+ int len;
+
+ if (strncmp(name, ada, 3) == 0)
+ len = 3;
+ else if (strncmp(name, ad, 2) == 0)
+ len = 2;
+ else
+ return (0);
+ if (name[len] '0' || name[len] '9')
+ return (0);
+ do {
+ len++;
+ } while (name[len] = '0' name[len] = '9');
+ return (len);
+}
+
+int
+g_compare_names(const char *namea, const char *nameb)
+{
+ int deva, devb;
+
+ if (strcmp(namea, nameb) == 0)
+ return (1);
+ deva = g_get_device_prefix_len(namea);
+ if (deva == 0)
+ return (0);
+ devb = g_get_device_prefix_len(nameb);
+ if (devb == 0)
+ return (0);
+ if (strcmp(namea + deva, nameb + devb) == 0)
+ return (1);
+ return (0);
+}
+
This is most likely my misunderstanding of things.
Can we have a legitimate situation where both ada* and ad* devices coexist
on the same system ? E.g. on-board AHCI and legacy PATA controller ?
Wouldn't this hack then wreak the havoc ? Can the hack be put under the
control of some tunable ?
pgpLM6VNsOmPP.pgp
Description: PGP signature
Re: svn commit: r221101 - in head/sys/geom: . concat journal mirror raid3 shsec stripe virstor
Kostik Belousov wrote:
On Wed, Apr 27, 2011 at 12:10:26AM +, Alexander Motin wrote:
Author: mav
Date: Wed Apr 27 00:10:26 2011
New Revision: 221101
URL: http://svn.freebsd.org/changeset/base/221101
Log:
Implement relaxed comparision for hardcoded provider names to make it
ignore adX/adaY difference in both directions to simplify migration to
the CAM-based ATA or back.
Modified:
head/sys/geom/concat/g_concat.c
head/sys/geom/geom.h
head/sys/geom/geom_subr.c
head/sys/geom/journal/g_journal.c
head/sys/geom/mirror/g_mirror.c
head/sys/geom/raid3/g_raid3.c
head/sys/geom/shsec/g_shsec.c
head/sys/geom/stripe/g_stripe.c
head/sys/geom/virstor/g_virstor.c
Modified: head/sys/geom/concat/g_concat.c
==
--- head/sys/geom/concat/g_concat.c Tue Apr 26 23:00:32 2011
(r221100)
+++ head/sys/geom/concat/g_concat.c Wed Apr 27 00:10:26 2011
(r221101)
@@ -678,7 +678,8 @@ g_concat_taste(struct g_class *mp, struc
if (md.md_version 4)
md.md_provsize = pp-mediasize;
-if (md.md_provider[0] != '\0' strcmp(md.md_provider, pp-name) != 0)
+if (md.md_provider[0] != '\0'
+!g_compare_names(md.md_provider, pp-name))
return (NULL);
if (md.md_provsize != pp-mediasize)
return (NULL);
Modified: head/sys/geom/geom.h
==
--- head/sys/geom/geom.h Tue Apr 26 23:00:32 2011(r221100)
+++ head/sys/geom/geom.h Wed Apr 27 00:10:26 2011(r221101)
@@ -238,6 +238,7 @@ void g_waitidlelock(void);
/* geom_subr.c */
int g_access(struct g_consumer *cp, int nread, int nwrite, int nexcl);
int g_attach(struct g_consumer *cp, struct g_provider *pp);
+int g_compare_names(const char *namea, const char *nameb);
void g_destroy_consumer(struct g_consumer *cp);
void g_destroy_geom(struct g_geom *pp);
void g_destroy_provider(struct g_provider *pp);
Modified: head/sys/geom/geom_subr.c
==
--- head/sys/geom/geom_subr.cTue Apr 26 23:00:32 2011
(r221100)
+++ head/sys/geom/geom_subr.cWed Apr 27 00:10:26 2011
(r221101)
@@ -1017,6 +1017,43 @@ g_getattr__(const char *attr, struct g_c
return (0);
}
+static int
+g_get_device_prefix_len(const char *name)
+{
+int len;
+
+if (strncmp(name, ada, 3) == 0)
+len = 3;
+else if (strncmp(name, ad, 2) == 0)
+len = 2;
+else
+return (0);
+if (name[len] '0' || name[len] '9')
+return (0);
+do {
+len++;
+} while (name[len] = '0' name[len] = '9');
+return (len);
+}
+
+int
+g_compare_names(const char *namea, const char *nameb)
+{
+int deva, devb;
+
+if (strcmp(namea, nameb) == 0)
+return (1);
+deva = g_get_device_prefix_len(namea);
+if (deva == 0)
+return (0);
+devb = g_get_device_prefix_len(nameb);
+if (devb == 0)
+return (0);
+if (strcmp(namea + deva, nameb + devb) == 0)
+return (1);
+return (0);
+}
+
This is most likely my misunderstanding of things.
Can we have a legitimate situation where both ada* and ad* devices coexist
on the same system ? E.g. on-board AHCI and legacy PATA controller ?
Yes, we can and sometimes do. But the new GENERIC kernels in CURRENT
switch everything to the adaX.
Wouldn't this hack then wreak the havoc ? Can the hack be put under the
control of some tunable ?
I can't imagine useful situation when device name part of the hardcoded
provider name is important. Only partition name sometimes is.
--
Alexander Motin
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221114 - head
Author: mav Date: Wed Apr 27 08:53:52 2011 New Revision: 221114 URL: http://svn.freebsd.org/changeset/base/221114 Log: Add obvious note that CAM drivers are required for using CAM ATA. Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Wed Apr 27 04:11:18 2011(r221113) +++ head/UPDATING Wed Apr 27 08:53:52 2011(r221114) @@ -41,6 +41,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. module work as CAM driver supporting legacy ATA controllers. Device ata still can be used in modular fashion (atacore + ...). Modules atadisk and atapi* are not used and won't affect operation in ATA_CAM mode. + Note that to use CAM-based ATA kernel should include CAM devices + scbus, pass, da (or explicitly ada), cd and optionally others. All of + them are parts of the cam module. ataraid(4) functionality is now supported by the RAID GEOM class. To use it you can load geom_raid kernel module and use graid(8) tool ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221115 - head/contrib/less
Author: obrien Date: Wed Apr 27 08:57:12 2011 New Revision: 221115 URL: http://svn.freebsd.org/changeset/base/221115 Log: Be clear of what licensing terms we are using. Deleted: head/contrib/less/COPYING Modified: head/contrib/less/README Modified: head/contrib/less/README == --- head/contrib/less/READMEWed Apr 27 08:53:52 2011(r221114) +++ head/contrib/less/READMEWed Apr 27 08:57:12 2011(r221115) @@ -1,3 +1,11 @@ +** +** +** ** +** The FreeBSD Project has chosen to redistribute and modify Less under ** +** the 'Less License' (as described in the 'LICENSE' file). ** +** ** +** +** Less, version 436 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221117 - stable/8/sys/sys
Author: kib Date: Wed Apr 27 09:35:40 2011 New Revision: 221117 URL: http://svn.freebsd.org/changeset/base/221117 Log: MFC r220987: Fix typo. Modified: stable/8/sys/sys/systm.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/sys/systm.h == --- stable/8/sys/sys/systm.hWed Apr 27 09:10:58 2011(r221116) +++ stable/8/sys/sys/systm.hWed Apr 27 09:35:40 2011(r221117) @@ -150,7 +150,7 @@ int nullop(void); inteopnotsupp(void); intureadc(int, struct uio *); void hashdestroy(void *, struct malloc_type *, u_long); -void *hashinit(int count, struct malloc_type *type, u_long *hashmark); +void *hashinit(int count, struct malloc_type *type, u_long *hashmask); void *hashinit_flags(int count, struct malloc_type *type, u_long *hashmask, int flags); #defineHASH_NOWAIT 0x0001 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221118 - head/share/misc
Author: pluknet Date: Wed Apr 27 12:12:22 2011 New Revision: 221118 URL: http://svn.freebsd.org/changeset/base/221118 Log: Add DragonFly 2.10.1 release. Modified: head/share/misc/bsd-family-tree Modified: head/share/misc/bsd-family-tree == --- head/share/misc/bsd-family-tree Wed Apr 27 09:35:40 2011 (r221117) +++ head/share/misc/bsd-family-tree Wed Apr 27 12:12:22 2011 (r221118) @@ -245,7 +245,7 @@ FreeBSD 5.2 | | | || | ||OpenBSD 4.8 | | || | | NetBSD 5.1 | | | FreeBSD FreeBSD | | | | - |8.2 7.4| | | | + |8.2 7.4| | | DragonFly 2.10.1 | v | | | | || | | | FreeBSD 9 -current| NetBSD -current OpenBSD -current | @@ -532,6 +532,7 @@ OpenBSD 4.8 2010-11-01 [OBD] NetBSD 5.1 2010-11-19 [NBD] FreeBSD 7.42011-02-24 [FBD] FreeBSD 8.22011-02-24 [FBD] +DragonFly 2.10.1 2011-04-26 [DFB] Bibliography ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221119 - head/usr.sbin/mfiutil
Author: pluknet
Date: Wed Apr 27 14:58:06 2011
New Revision: 221119
URL: http://svn.freebsd.org/changeset/base/221119
Log:
Fix typo in continuously argument used in patrol auto command.
Obtained from:Sascha Wildner saw att online dott de
Approved by: jhb
MFC after:3 days
Modified:
head/usr.sbin/mfiutil/mfi_patrol.c
Modified: head/usr.sbin/mfiutil/mfi_patrol.c
==
--- head/usr.sbin/mfiutil/mfi_patrol.c Wed Apr 27 12:12:22 2011
(r221118)
+++ head/usr.sbin/mfiutil/mfi_patrol.c Wed Apr 27 14:58:06 2011
(r221119)
@@ -252,7 +252,7 @@ patrol_config(int ac, char **av)
if (strcasecmp(av[1], auto) == 0) {
op_mode = MFI_PR_OPMODE_AUTO;
if (ac 2) {
- if (strcasecmp(av[2], continously) == 0)
+ if (strcasecmp(av[2], continuously) == 0)
exec_freq = 0x;
else {
val = strtol(av[2], cp, 0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221053 - head/usr.bin/rlogin
On Tuesday, April 26, 2011 6:26:41 pm David O'Brien wrote: On Tue, Apr 26, 2011 at 09:32:44AM -0400, John Baldwin wrote: On Tuesday, April 26, 2011 12:09:20 am David E. O'Brien wrote: Author: obrien Date: Tue Apr 26 04:09:20 2011 New Revision: 221053 URL: http://svn.freebsd.org/changeset/base/221053 Log: This builds OK using the parent dir's WARNS=6. [built on both AMD64 and i386] This breaks the tinderbox on at least arm, ia64, mips, and sparc64. Sigh. Do we yet have ARM, MIPS, or Sparc64 test machines in the cluster? http://www.freebsd.org/internal/machines.html doesn't list any, but maybe some have been added? Umm, I just did: make TARGET=ia64 toolchain make TARGET=ia64 buildenv cd usr.bin/rlogin make to test my fixes to rlogin. For changing WARNS, 'make universe' works well (I have one running right now before I re-enable this change). -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221120 - stable/8/sys/dev/cxgbe
Author: np
Date: Wed Apr 27 16:16:01 2011
New Revision: 221120
URL: http://svn.freebsd.org/changeset/base/221120
Log:
MFC r220873, r220897, r220905.
r220873:
- Move all Ethernet specific items from sge_eq to sge_txq. sge_eq is
now a suitable base for all kinds of egress queues.
- Add control queues (sge_ctrlq) and allocate one of these per hardware
channel. They can be used to program filters and steer traffic (and
more).
r220897:
Use the correct free routine when destroying a control queue.
r220905:
Ring the freelist doorbell from within refill_fl. While here, fix a bug
that could have allowed the hardware pidx to reach the cidx even though
the freelist isn't empty. (Haven't actually seen this but it was there
waiting to happen..)
Modified:
stable/8/sys/dev/cxgbe/adapter.h
stable/8/sys/dev/cxgbe/t4_main.c
stable/8/sys/dev/cxgbe/t4_sge.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/cxgbe/adapter.h
==
--- stable/8/sys/dev/cxgbe/adapter.hWed Apr 27 14:58:06 2011
(r221119)
+++ stable/8/sys/dev/cxgbe/adapter.hWed Apr 27 16:16:01 2011
(r221120)
@@ -110,6 +110,9 @@ enum {
FW_IQ_QSIZE = 256,
FW_IQ_ESIZE = 64, /* At least 64 mandated by the firmware spec */
+ CTRL_EQ_QSIZE = 128,
+ CTRL_EQ_ESIZE = 64,
+
RX_IQ_QSIZE = 1024,
RX_IQ_ESIZE = 64, /* At least 64 so CPL_RX_PKT will fit */
@@ -218,7 +221,7 @@ struct tx_map {
struct tx_sdesc {
uint8_t desc_used; /* # of hardware descriptors used by the WR */
- uint8_t map_used; /* # of frames sent out in the WR */
+ uint8_t credits;/* NIC txq: # of frames sent out in the WR */
};
typedef void (iq_intr_handler_t)(void *);
@@ -275,7 +278,6 @@ enum {
* consumes them) but it's special enough to have its own struct (see sge_fl).
*/
struct sge_eq {
- bus_dma_tag_t tx_tag; /* tag for transmit buffers */
bus_dma_tag_t desc_tag;
bus_dmamap_t desc_map;
char lockname[16];
@@ -284,8 +286,6 @@ struct sge_eq {
struct tx_desc *desc; /* KVA of descriptor ring */
bus_addr_t ba; /* bus address of descriptor ring */
- struct tx_sdesc *sdesc; /* KVA of software descriptor ring */
- struct buf_ring *br;/* tx buffer ring */
struct sge_qstat *spg; /* status page, for convenience */
uint16_t cap; /* max # of desc, for convenience */
uint16_t avail; /* available descriptors, for convenience */
@@ -295,14 +295,7 @@ struct sge_eq {
uint16_t pending; /* # of descriptors used since last doorbell */
uint16_t iqid; /* iq that gets egr_update for the eq */
uint32_t cntxt_id; /* SGE context id for the eq */
-
- /* DMA maps used for tx */
- struct tx_map *maps;
- uint32_t map_total; /* # of DMA maps */
- uint32_t map_pidx; /* next map to be used */
- uint32_t map_cidx; /* reclaimed up to this index */
- uint32_t map_avail; /* # of available maps */
-} __aligned(CACHE_LINE_SIZE);
+};
struct sge_fl {
bus_dma_tag_t desc_tag;
@@ -325,13 +318,23 @@ struct sge_fl {
unsigned int dmamap_failed;
};
-/* txq: SGE egress queue + miscellaneous items */
+/* txq: SGE egress queue + what's needed for Ethernet NIC */
struct sge_txq {
struct sge_eq eq; /* MUST be first */
+
+ struct ifnet *ifp; /* the interface this txq belongs to */
+ bus_dma_tag_t tx_tag; /* tag for transmit buffers */
+ struct buf_ring *br;/* tx buffer ring */
+ struct tx_sdesc *sdesc; /* KVA of software descriptor ring */
struct mbuf *m; /* held up due to temporary resource shortage */
struct task resume_tx;
- struct ifnet *ifp; /* the interface this txq belongs to */
+ /* DMA maps used for tx */
+ struct tx_map *maps;
+ uint32_t map_total; /* # of DMA maps */
+ uint32_t map_pidx; /* next map to be used */
+ uint32_t map_cidx; /* reclaimed up to this index */
+ uint32_t map_avail; /* # of available maps */
/* stats for common events first */
@@ -349,11 +352,12 @@ struct sge_txq {
uint32_t no_dmamap; /* no DMA map to load the mbuf */
uint32_t no_desc; /* out of hardware descriptors */
uint32_t egr_update;/* # of SGE_EGR_UPDATE notifications for txq */
-};
+} __aligned(CACHE_LINE_SIZE);
enum {
RXQ_LRO_ENABLED = (1 0)
};
+
/* rxq: SGE ingress queue + SGE free list + miscellaneous items */
struct sge_rxq {
svn commit: r221121 - in head/sys: ddb dev/watchdog sys
Author: attilio
Date: Wed Apr 27 16:43:03 2011
New Revision: 221121
URL: http://svn.freebsd.org/changeset/base/221121
Log:
- Add the possibility to reuse the already last used timeout when patting
the watchdog, via the watchdog(9) interface.
For that, the WD_LASTVAL bitwise operation is used. It is mutually
exclusive with any explicit timout passing to the watchdogs.
The last timeout can be returned via the wdog_kern_last_timeout()
KPI.
- Add the possibility to pat the watchdogs installed via the watchdog(9)
interface from the kernel.
In order to do that the new KPI wdog_kern_pat() is offered and it does
accept normalized nanoseconds or WD_LASTVAL.
- Avoid to pass WD_ACTIVE down in the watchdog handlers. All the control
bit processing should over to the upper layer functions and not passed
down to the handlers at all.
These changes are intended to be used in order to fix up the watchdog
tripping in situation when the userland is busted, but protection is still
wanted (examples: shutdown syncing / disk dumping).
Sponsored by: Sandvine Incorporated
Reviewed by: emaste, des, cognet
MFC after:2 weeks
Modified:
head/sys/ddb/db_command.c
head/sys/dev/watchdog/watchdog.c
head/sys/sys/watchdog.h
Modified: head/sys/ddb/db_command.c
==
--- head/sys/ddb/db_command.c Wed Apr 27 16:16:01 2011(r221120)
+++ head/sys/ddb/db_command.c Wed Apr 27 16:43:03 2011(r221121)
@@ -724,14 +724,6 @@ db_watchdog(dummy1, dummy2, dummy3, dumm
} else if ((tout WD_INTERVAL) == WD_TO_NEVER) {
db_error(Out of range watchdog interval\n);
return;
- } else {
-
- /*
-* XXX: Right now we only support WD_ACTIVE, in the future we
-* may be possibly needing a more convoluted function for
-* dealing with different cases.
-*/
- tout |= WD_ACTIVE;
}
EVENTHANDLER_INVOKE(watchdog_list, tout, i);
}
Modified: head/sys/dev/watchdog/watchdog.c
==
--- head/sys/dev/watchdog/watchdog.cWed Apr 27 16:16:01 2011
(r221120)
+++ head/sys/dev/watchdog/watchdog.cWed Apr 27 16:43:03 2011
(r221121)
@@ -40,35 +40,73 @@ __FBSDID($FreeBSD$);
#include machine/bus.h
static struct cdev *wd_dev;
+static volatile u_int wd_last_u;
+
+static int
+kern_do_pat(u_int utim)
+{
+ int error;
+
+ if ((utim WD_LASTVAL) != 0 (utim WD_INTERVAL) 0)
+ return (EINVAL);
+
+ if ((utim WD_LASTVAL) != 0) {
+ MPASS((wd_last_u ~WD_INTERVAL) == 0);
+ utim = ~WD_LASTVAL;
+ utim |= wd_last_u;
+ } else
+ wd_last_u = (utim WD_INTERVAL);
+ if ((utim WD_INTERVAL) == WD_TO_NEVER) {
+ utim = 0;
+
+ /* Assume all is well; watchdog signals failure. */
+ error = 0;
+ } else {
+ /* Assume no watchdog available; watchdog flags success */
+ error = EOPNOTSUPP;
+ }
+ EVENTHANDLER_INVOKE(watchdog_list, utim, error);
+ return (error);
+}
static int
wd_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data,
int flags __unused, struct thread *td)
{
- int error;
u_int u;
if (cmd != WDIOCPATPAT)
return (ENOIOCTL);
u = *(u_int *)data;
- if (u ~(WD_ACTIVE | WD_PASSIVE | WD_INTERVAL))
+ if (u ~(WD_ACTIVE | WD_PASSIVE | WD_LASTVAL | WD_INTERVAL))
return (EINVAL);
if ((u (WD_ACTIVE | WD_PASSIVE)) == (WD_ACTIVE | WD_PASSIVE))
return (EINVAL);
- if ((u (WD_ACTIVE | WD_PASSIVE)) == 0 (u WD_INTERVAL) 0)
+ if ((u (WD_ACTIVE | WD_PASSIVE)) == 0 ((u WD_INTERVAL) 0 ||
+ (u WD_LASTVAL) != 0))
return (EINVAL);
if (u WD_PASSIVE)
return (ENOSYS);/* XXX Not implemented yet */
- if ((u WD_INTERVAL) == WD_TO_NEVER) {
- u = 0;
- /* Assume all is well; watchdog signals failure. */
- error = 0;
- } else {
- /* Assume no watchdog available; watchdog flags success */
- error = EOPNOTSUPP;
- }
- EVENTHANDLER_INVOKE(watchdog_list, u, error);
- return (error);
+ u = ~(WD_ACTIVE | WD_PASSIVE);
+
+ return (kern_do_pat(u));
+}
+
+u_int
+wdog_kern_last_timeout(void)
+{
+
+ return (wd_last_u);
+}
+
+int
+wdog_kern_pat(u_int utim)
+{
+
+ if (utim ~(WD_LASTVAL | WD_INTERVAL))
+ return (EINVAL);
+
+ return (kern_do_pat(utim));
}
static struct cdevsw wd_cdevsw = {
Modified: head/sys/sys/watchdog.h
==
---
svn commit: r221122 - stable/8/sys/mips/conf
Author: pluknet Date: Wed Apr 27 17:07:22 2011 New Revision: 221122 URL: http://svn.freebsd.org/changeset/base/221122 Log: MFC r216475 (by gonzo): - include argument should be in quotes Modified: stable/8/sys/mips/conf/SWARM stable/8/sys/mips/conf/SWARM64 stable/8/sys/mips/conf/SWARM64_SMP stable/8/sys/mips/conf/SWARM_SMP Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/mips/conf/SWARM == --- stable/8/sys/mips/conf/SWARMWed Apr 27 16:43:03 2011 (r221121) +++ stable/8/sys/mips/conf/SWARMWed Apr 27 17:07:22 2011 (r221122) @@ -2,7 +2,7 @@ # $FreeBSD$ # -includestd.SWARM +includestd.SWARM ident SWARM Modified: stable/8/sys/mips/conf/SWARM64 == --- stable/8/sys/mips/conf/SWARM64 Wed Apr 27 16:43:03 2011 (r221121) +++ stable/8/sys/mips/conf/SWARM64 Wed Apr 27 17:07:22 2011 (r221122) @@ -2,7 +2,7 @@ # $FreeBSD$ # -includestd.SWARM +includestd.SWARM ident SWARM64 Modified: stable/8/sys/mips/conf/SWARM64_SMP == --- stable/8/sys/mips/conf/SWARM64_SMP Wed Apr 27 16:43:03 2011 (r221121) +++ stable/8/sys/mips/conf/SWARM64_SMP Wed Apr 27 17:07:22 2011 (r221122) @@ -2,7 +2,7 @@ # $FreeBSD$ # -includestd.SWARM +includestd.SWARM ident SWARM64_SMP Modified: stable/8/sys/mips/conf/SWARM_SMP == --- stable/8/sys/mips/conf/SWARM_SMPWed Apr 27 16:43:03 2011 (r221121) +++ stable/8/sys/mips/conf/SWARM_SMPWed Apr 27 17:07:22 2011 (r221122) @@ -2,7 +2,7 @@ # $FreeBSD$ # -includestd.SWARM +includestd.SWARM ident SWARM_SMP ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221123 - head/usr.bin/rlogin
Author: jhb Date: Wed Apr 27 17:36:37 2011 New Revision: 221123 URL: http://svn.freebsd.org/changeset/base/221123 Log: Raise rlogin back to a WARNS level of 6. Tested by:make universe Modified: head/usr.bin/rlogin/Makefile Modified: head/usr.bin/rlogin/Makefile == --- head/usr.bin/rlogin/MakefileWed Apr 27 17:07:22 2011 (r221122) +++ head/usr.bin/rlogin/MakefileWed Apr 27 17:36:37 2011 (r221123) @@ -7,6 +7,4 @@ BINOWN= root BINMODE=4555 PRECIOUSPROG= -WARNS?=3 - .include bsd.prog.mk ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221124 - in head: . sbin/mount sbin/mount_nfs sys/amd64/conf sys/fs/nfsclient sys/i386/conf sys/ia64/conf sys/nfsclient sys/pc98/conf sys/powerpc/conf sys/sparc64/conf sys/sun4v/conf
Author: rmacklem
Date: Wed Apr 27 17:51:51 2011
New Revision: 221124
URL: http://svn.freebsd.org/changeset/base/221124
Log:
This patch changes head so that the default NFS client is now the new
NFS client (which I guess is no longer experimental). The fstype newnfs
is now nfs and the regular/old NFS client is now fstype oldnfs.
Although mounts via fstype nfs will usually work without userland
changes, an updated mount_nfs(8) binary is needed for kernels built with
options NFSCL but not options NFSCLIENT. Updated mount_nfs(8) and
mount(8) binaries are needed to do mounts for fstype oldnfs.
The GENERIC kernel configs have been changed to use options
NFSCL and NFSD (the new client and server) instead of NFSCLIENT and NFSSERVER.
For kernels being used on diskless NFS root systems, options NFSCL
must be in the kernel config.
Discussed on freebsd-fs@.
Modified:
head/UPDATING
head/sbin/mount/mount.c
head/sbin/mount_nfs/Makefile
head/sbin/mount_nfs/mount_nfs.c
head/sys/amd64/conf/GENERIC
head/sys/fs/nfsclient/nfs_clvfsops.c
head/sys/i386/conf/GENERIC
head/sys/ia64/conf/GENERIC
head/sys/nfsclient/nfs_vfsops.c
head/sys/pc98/conf/GENERIC
head/sys/powerpc/conf/GENERIC
head/sys/powerpc/conf/GENERIC64
head/sys/sparc64/conf/GENERIC
head/sys/sun4v/conf/GENERIC
Modified: head/UPDATING
==
--- head/UPDATING Wed Apr 27 17:36:37 2011(r221123)
+++ head/UPDATING Wed Apr 27 17:51:51 2011(r221124)
@@ -22,6 +22,24 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20110427:
+ The default NFS client is now the new NFS client, so fstype newnfs
+ is now nfs and the regular/old NFS client is now fstype oldnfs.
+ Although mounts via fstype nfs will usually work without userland
+ changes, it is recommended that the mount(8) and mount_nfs(8)
+ commands be rebuilt from sources and that a link to mount_nfs called
+ mount_oldnfs be created. The new client is compiled into the
+ kernel with options NFSCL and this is needed for diskless root
+ file systems. The GENERIC kernel configs have been changed to use
+ NFSCL and NFSD (the new server) instead of NFSCLIENT and NFSSERVER.
+ To use the regular/old client, you can mount -t oldnfs For
+ a diskless root file system, you must also include a line like:
+
+ vfs.root.mountfrom=oldnfs:
+
+ in the boot/loader.conf on the root fs on the NFS server to make
+ a diskless root fs use the old client.
+
20110424:
The GENERIC kernels for all architectures now default to the new
CAM-based ATA stack. It means that all legacy ATA drivers were
Modified: head/sbin/mount/mount.c
==
--- head/sbin/mount/mount.c Wed Apr 27 17:36:37 2011(r221123)
+++ head/sbin/mount/mount.c Wed Apr 27 17:51:51 2011(r221124)
@@ -141,8 +141,8 @@ use_mountprog(const char *vfstype)
*/
unsigned int i;
const char *fs[] = {
- cd9660, mfs, msdosfs, newnfs, nfs, ntfs,
- nwfs, nullfs, portalfs, smbfs, udf, unionfs,
+ cd9660, mfs, msdosfs, nfs, ntfs,
+ nwfs, nullfs, oldnfs, portalfs, smbfs, udf, unionfs,
NULL
};
Modified: head/sbin/mount_nfs/Makefile
==
--- head/sbin/mount_nfs/MakefileWed Apr 27 17:36:37 2011
(r221123)
+++ head/sbin/mount_nfs/MakefileWed Apr 27 17:51:51 2011
(r221124)
@@ -12,7 +12,7 @@ UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.u
CFLAGS+= -DNFS -I${MOUNT} -I${UMNTALL}
WARNS?=3
-LINKS= ${BINDIR}/mount_nfs ${BINDIR}/mount_newnfs
+LINKS= ${BINDIR}/mount_nfs ${BINDIR}/mount_oldnfs
.PATH: ${MOUNT} ${UMNTALL}
Modified: head/sbin/mount_nfs/mount_nfs.c
==
--- head/sbin/mount_nfs/mount_nfs.c Wed Apr 27 17:36:37 2011
(r221123)
+++ head/sbin/mount_nfs/mount_nfs.c Wed Apr 27 17:51:51 2011
(r221124)
@@ -273,7 +273,7 @@ main(int argc, char *argv[])
} else if (strcmp(opt, nfsv4) == 0) {
pass_flag_to_nmount=0;
mountmode = V4;
- fstype = newnfs;
+ fstype = nfs;
nfsproto = IPPROTO_TCP;
if (portspec == NULL)
portspec = 2049;
@@ -381,14 +381,10 @@ main(int argc, char *argv[])
retrycnt = 0;
/*
-* If the experimental nfs subsystem is loaded
svn commit: r221125 - in stable/8/sys: amd64/acpica cam dev/sound/usb dev/usb dev/usb/controller dev/usb/input dev/usb/misc dev/usb/net dev/usb/quirk dev/usb/serial dev/usb/storage dev/usb/template...
Author: jhb Date: Wed Apr 27 18:00:46 2011 New Revision: 221125 URL: http://svn.freebsd.org/changeset/base/221125 Log: MFC 217265: Remove unneeded includes of sys/linker_set.h. Other headers that use it internally contain nested includes. Requested by: hselasky Modified: stable/8/sys/amd64/acpica/OsdEnvironment.c stable/8/sys/cam/cam_periph.c stable/8/sys/dev/sound/usb/uaudio.c stable/8/sys/dev/usb/controller/at91dci.c stable/8/sys/dev/usb/controller/at91dci_atmelarm.c stable/8/sys/dev/usb/controller/atmegadci.c stable/8/sys/dev/usb/controller/atmegadci_atmelarm.c stable/8/sys/dev/usb/controller/avr32dci.c stable/8/sys/dev/usb/controller/ehci.c stable/8/sys/dev/usb/controller/ehci_ixp4xx.c stable/8/sys/dev/usb/controller/ehci_mbus.c stable/8/sys/dev/usb/controller/ehci_pci.c stable/8/sys/dev/usb/controller/musb_otg.c stable/8/sys/dev/usb/controller/musb_otg_atmelarm.c stable/8/sys/dev/usb/controller/ohci.c stable/8/sys/dev/usb/controller/ohci_atmelarm.c stable/8/sys/dev/usb/controller/ohci_pci.c stable/8/sys/dev/usb/controller/uhci.c stable/8/sys/dev/usb/controller/uhci_pci.c stable/8/sys/dev/usb/controller/usb_controller.c stable/8/sys/dev/usb/controller/uss820dci.c stable/8/sys/dev/usb/controller/uss820dci_atmelarm.c stable/8/sys/dev/usb/controller/xhci.c stable/8/sys/dev/usb/controller/xhci_pci.c stable/8/sys/dev/usb/input/uhid.c stable/8/sys/dev/usb/input/ukbd.c stable/8/sys/dev/usb/input/ums.c stable/8/sys/dev/usb/misc/udbp.c stable/8/sys/dev/usb/misc/ufm.c stable/8/sys/dev/usb/net/if_aue.c stable/8/sys/dev/usb/net/if_axe.c stable/8/sys/dev/usb/net/if_cdce.c stable/8/sys/dev/usb/net/if_cue.c stable/8/sys/dev/usb/net/if_ipheth.c stable/8/sys/dev/usb/net/if_kue.c stable/8/sys/dev/usb/net/if_rue.c stable/8/sys/dev/usb/net/if_udav.c stable/8/sys/dev/usb/net/usb_ethernet.c stable/8/sys/dev/usb/quirk/usb_quirk.c stable/8/sys/dev/usb/serial/u3g.c stable/8/sys/dev/usb/serial/uark.c stable/8/sys/dev/usb/serial/ubsa.c stable/8/sys/dev/usb/serial/ubser.c stable/8/sys/dev/usb/serial/uchcom.c stable/8/sys/dev/usb/serial/ucycom.c stable/8/sys/dev/usb/serial/ufoma.c stable/8/sys/dev/usb/serial/uftdi.c stable/8/sys/dev/usb/serial/ugensa.c stable/8/sys/dev/usb/serial/uipaq.c stable/8/sys/dev/usb/serial/ulpt.c stable/8/sys/dev/usb/serial/umct.c stable/8/sys/dev/usb/serial/umodem.c stable/8/sys/dev/usb/serial/umoscom.c stable/8/sys/dev/usb/serial/uplcom.c stable/8/sys/dev/usb/serial/usb_serial.c stable/8/sys/dev/usb/serial/uslcom.c stable/8/sys/dev/usb/serial/uvisor.c stable/8/sys/dev/usb/serial/uvscom.c stable/8/sys/dev/usb/storage/umass.c stable/8/sys/dev/usb/storage/urio.c stable/8/sys/dev/usb/storage/ustorage_fs.c stable/8/sys/dev/usb/template/usb_template.c stable/8/sys/dev/usb/template/usb_template_cdce.c stable/8/sys/dev/usb/template/usb_template_msc.c stable/8/sys/dev/usb/template/usb_template_mtp.c stable/8/sys/dev/usb/usb_busdma.c stable/8/sys/dev/usb/usb_compat_linux.c stable/8/sys/dev/usb/usb_core.c stable/8/sys/dev/usb/usb_debug.c stable/8/sys/dev/usb/usb_dev.c stable/8/sys/dev/usb/usb_device.c stable/8/sys/dev/usb/usb_dynamic.c stable/8/sys/dev/usb/usb_error.c stable/8/sys/dev/usb/usb_generic.c stable/8/sys/dev/usb/usb_handle_request.c stable/8/sys/dev/usb/usb_hid.c stable/8/sys/dev/usb/usb_hub.c stable/8/sys/dev/usb/usb_lookup.c stable/8/sys/dev/usb/usb_mbuf.c stable/8/sys/dev/usb/usb_msctest.c stable/8/sys/dev/usb/usb_parse.c stable/8/sys/dev/usb/usb_process.c stable/8/sys/dev/usb/usb_request.c stable/8/sys/dev/usb/usb_transfer.c stable/8/sys/dev/usb/usb_util.c stable/8/sys/i386/acpica/OsdEnvironment.c stable/8/sys/ia64/acpica/OsdEnvironment.c stable/8/sys/kern/kern_lock.c stable/8/sys/kern/kern_sx.c stable/8/sys/kern/subr_lock.c stable/8/sys/kern/subr_pcpu.c stable/8/sys/mips/cavium/usb/octusb.c stable/8/sys/mips/cavium/usb/octusb_octeon.c stable/8/sys/mips/rmi/xls_ehci.c stable/8/sys/net/vnet.c stable/8/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c stable/8/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c stable/8/sys/sparc64/sparc64/db_trace.c stable/8/sys/sparc64/sparc64/tlb.c stable/8/sys/sparc64/sparc64/tsb.c stable/8/sys/sparc64/sparc64/vm_machdep.c stable/8/sys/sun4v/sun4v/db_interface.c stable/8/sys/sun4v/sun4v/db_trace.c stable/8/sys/sun4v/sun4v/vm_machdep.c stable/8/sys/vm/phys_pager.c stable/8/sys/vm/vm_contig.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/amd64/acpica/OsdEnvironment.c == --- stable/8/sys/amd64/acpica/OsdEnvironment.c Wed Apr 27 17:51:51
svn commit: r221126 - head/sys/fs/ext2fs
Author: jhb
Date: Wed Apr 27 18:15:34 2011
New Revision: 221126
URL: http://svn.freebsd.org/changeset/base/221126
Log:
Various style fixes including using uint*_t instead of u_int*_t.
Submitted by: Pedro F. Giffuni giffunip at yahoo
Modified:
head/sys/fs/ext2fs/ext2_alloc.c
head/sys/fs/ext2fs/ext2_dinode.h
head/sys/fs/ext2fs/ext2_dir.h
head/sys/fs/ext2fs/ext2fs.h
head/sys/fs/ext2fs/inode.h
Modified: head/sys/fs/ext2fs/ext2_alloc.c
==
--- head/sys/fs/ext2fs/ext2_alloc.c Wed Apr 27 18:00:46 2011
(r221125)
+++ head/sys/fs/ext2fs/ext2_alloc.c Wed Apr 27 18:15:34 2011
(r221126)
@@ -181,7 +181,7 @@ return ENOSPC;
struct ext2mount *ump;
struct cluster_save *buflist;
struct indir start_ap[NIADDR + 1], end_ap[NIADDR + 1], *idp;
- int32_t start_lbn, end_lbn, soff, newblk, blkno =0;
+ int32_t start_lbn, end_lbn, soff, newblk, blkno;
int i, len, start_lvl, end_lvl, pref, ssize;
vp = ap-a_vp;
@@ -231,7 +231,7 @@ return ENOSPC;
* Find the preferred location for the cluster.
*/
EXT2_LOCK(ump);
- pref = ext2_blkpref(ip, start_lbn, soff, sbap, blkno);
+ pref = ext2_blkpref(ip, start_lbn, soff, sbap, 0);
/*
* If the block range spans two block maps, get the second map.
*/
Modified: head/sys/fs/ext2fs/ext2_dinode.h
==
--- head/sys/fs/ext2fs/ext2_dinode.hWed Apr 27 18:00:46 2011
(r221125)
+++ head/sys/fs/ext2fs/ext2_dinode.hWed Apr 27 18:15:34 2011
(r221126)
@@ -66,29 +66,29 @@
* Structure of an inode on the disk
*/
struct ext2fs_dinode {
- u_int16_t e2di_mode; /* 0: IFMT, permissions; see below. */
- u_int16_t e2di_uid; /* 2: Owner UID */
- u_int32_t e2di_size; /* 4: Size (in bytes) */
- u_int32_t e2di_atime; /* 8: Access time */
- u_int32_t e2di_ctime; /* 12: Create time */
- u_int32_t e2di_mtime; /* 16: Modification time */
- u_int32_t e2di_dtime; /* 20: Deletion time */
- u_int16_t e2di_gid; /* 24: Owner GID */
- u_int16_t e2di_nlink; /* 26: File link count */
- u_int32_t e2di_nblock;/* 28: Blocks count */
- u_int32_t e2di_flags; /* 32: Status flags (chflags) */
- u_int32_t e2di_linux_reserved1; /* 36 */
- u_int32_t e2di_blocks[EXT2_N_BLOCKS]; /* 40: disk blocks */
- u_int32_t e2di_gen; /* 100: generation number */
- u_int32_t e2di_facl; /* 104: file ACL (not implemented) */
- u_int32_t e2di_dacl; /* 108: dir ACL (not implemented) */
- u_int32_t e2di_faddr; /* 112: fragment address */
- u_int8_te2di_nfrag; /* 116: fragment number */
- u_int8_te2di_fsize; /* 117: fragment size */
- u_int16_t e2di_linux_reserved2; /* 118 */
- u_int16_t e2di_uid_high; /* 120: Owner UID top 16 bits */
- u_int16_t e2di_gid_high; /* 122: Owner GID top 16 bits */
- u_int32_t e2di_linux_reserved3; /* 124 */
+ uint16_te2di_mode; /* 0: IFMT, permissions; see below. */
+ uint16_te2di_uid; /* 2: Owner UID */
+ uint32_te2di_size; /* 4: Size (in bytes) */
+ uint32_te2di_atime; /* 8: Access time */
+ uint32_te2di_ctime; /* 12: Create time */
+ uint32_te2di_mtime; /* 16: Modification time */
+ uint32_te2di_dtime; /* 20: Deletion time */
+ uint16_te2di_gid; /* 24: Owner GID */
+ uint16_te2di_nlink; /* 26: File link count */
+ uint32_te2di_nblock;/* 28: Blocks count */
+ uint32_te2di_flags; /* 32: Status flags (chflags) */
+ uint32_te2di_linux_reserved1; /* 36 */
+ uint32_te2di_blocks[EXT2_N_BLOCKS]; /* 40: disk blocks */
+ uint32_te2di_gen; /* 100: generation number */
+ uint32_te2di_facl; /* 104: file ACL (not implemented) */
+ uint32_te2di_dacl; /* 108: dir ACL (not implemented) */
+ uint32_te2di_faddr; /* 112: fragment address */
+ uint8_t e2di_nfrag; /* 116: fragment number */
+ uint8_t e2di_fsize; /* 117: fragment size */
+ uint16_te2di_linux_reserved2; /* 118 */
+ uint16_te2di_uid_high; /* 120: Owner UID top 16 bits */
+ uint16_te2di_gid_high; /* 122: Owner GID top 16 bits */
+ uint32_te2di_linux_reserved3; /* 124 */
};
#endif /* !_FS_EXT2FS_EXT2_DINODE_H_ */
Modified:
svn commit: r221127 - head/sys/rpc
Author: rmacklem
Date: Wed Apr 27 18:19:26 2011
New Revision: 221127
URL: http://svn.freebsd.org/changeset/base/221127
Log:
This patch is believed to fix a problem in the kernel rpc for
non-interruptible NFS mounts, where a kernel thread will seem
to be stuck sleeping on rpccon. The msleep() in clnt_vc_create()
that was waiting to a TCP connect to complete would return ERESTART,
since PCATCH was specified. Then the tsleep() in clnt_reconnect_call()
would sleep for 1 second and then try again and again and...
The patch changes the msleep() in clnt_vc_create() so it only sets
the PCATCH flag for interruptible cases.
Tested by:pho
Reviewed by: jhb
MFC after:2 weeks
Modified:
head/sys/rpc/clnt.h
head/sys/rpc/clnt_rc.c
head/sys/rpc/clnt_vc.c
head/sys/rpc/rpcb_clnt.c
Modified: head/sys/rpc/clnt.h
==
--- head/sys/rpc/clnt.h Wed Apr 27 18:15:34 2011(r221126)
+++ head/sys/rpc/clnt.h Wed Apr 27 18:19:26 2011(r221127)
@@ -433,10 +433,11 @@ extern CLIENT *clnt_dg_create(struct soc
* rpcvers_t vers; -- version number
* size_t sendsz; -- buffer recv size
* size_t recvsz; -- buffer send size
+ * int intrflag; -- is it interruptible
*/
extern CLIENT *clnt_vc_create(struct socket *so,
struct sockaddr *svcaddr, rpcprog_t program, rpcvers_t version,
-size_t sendsz, size_t recvsz);
+size_t sendsz, size_t recvsz, int intrflag);
/*
* struct netconfig *nconf;-- network type
Modified: head/sys/rpc/clnt_rc.c
==
--- head/sys/rpc/clnt_rc.c Wed Apr 27 18:15:34 2011(r221126)
+++ head/sys/rpc/clnt_rc.c Wed Apr 27 18:19:26 2011(r221127)
@@ -195,7 +195,7 @@ clnt_reconnect_connect(CLIENT *cl)
else
newclient = clnt_vc_create(so,
(struct sockaddr *) rc-rc_addr, rc-rc_prog, rc-rc_vers,
- rc-rc_sendsz, rc-rc_recvsz);
+ rc-rc_sendsz, rc-rc_recvsz, rc-rc_intr);
td-td_ucred = oldcred;
if (!newclient) {
Modified: head/sys/rpc/clnt_vc.c
==
--- head/sys/rpc/clnt_vc.c Wed Apr 27 18:15:34 2011(r221126)
+++ head/sys/rpc/clnt_vc.c Wed Apr 27 18:19:26 2011(r221127)
@@ -168,7 +168,8 @@ clnt_vc_create(
const rpcprog_t prog, /* program number */
const rpcvers_t vers, /* version number */
size_t sendsz, /* buffer recv size */
- size_t recvsz) /* buffer send size */
+ size_t recvsz, /* buffer send size */
+ int intrflag) /* interruptible */
{
CLIENT *cl; /* client handle */
struct ct_data *ct = NULL; /* client handle */
@@ -177,7 +178,7 @@ clnt_vc_create(
static uint32_t disrupt;
struct __rpc_sockinfo si;
XDR xdrs;
- int error, interrupted, one = 1;
+ int error, interrupted, one = 1, sleep_flag;
struct sockopt sopt;
if (disrupt == 0)
@@ -196,10 +197,13 @@ clnt_vc_create(
error = soconnect(so, raddr, curthread);
SOCK_LOCK(so);
interrupted = 0;
+ sleep_flag = PSOCK;
+ if (intrflag != 0)
+ sleep_flag |= (PCATCH | PBDRY);
while ((so-so_state SS_ISCONNECTING)
so-so_error == 0) {
error = msleep(so-so_timeo, SOCK_MTX(so),
- PSOCK | PCATCH | PBDRY, connec, 0);
+ sleep_flag, connec, 0);
if (error) {
if (error == EINTR || error == ERESTART)
interrupted = 1;
Modified: head/sys/rpc/rpcb_clnt.c
==
--- head/sys/rpc/rpcb_clnt.cWed Apr 27 18:15:34 2011(r221126)
+++ head/sys/rpc/rpcb_clnt.cWed Apr 27 18:19:26 2011(r221127)
@@ -477,7 +477,7 @@ local_rpcb()
tsize = __rpc_get_t_size(AF_LOCAL, 0, 0);
client = clnt_vc_create(so, (struct sockaddr *)sun,
(rpcprog_t)RPCBPROG,
- (rpcvers_t)RPCBVERS, tsize, tsize);
+ (rpcvers_t)RPCBVERS, tsize, tsize, 1);
if (client != NULL) {
/* Mark the socket to be closed in destructor */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221128 - head/sys/fs/ext2fs
Author: jhb Date: Wed Apr 27 18:25:35 2011 New Revision: 221128 URL: http://svn.freebsd.org/changeset/base/221128 Log: Use a private EXT2_ROOTINO constant instead of redefining ROOTINO. Submitted by: Pedro F. Giffuni giffunip at yahoo Modified: head/sys/fs/ext2fs/ext2_lookup.c head/sys/fs/ext2fs/ext2_vfsops.c head/sys/fs/ext2fs/ext2_vnops.c head/sys/fs/ext2fs/inode.h Modified: head/sys/fs/ext2fs/ext2_lookup.c == --- head/sys/fs/ext2fs/ext2_lookup.cWed Apr 27 18:19:26 2011 (r221127) +++ head/sys/fs/ext2fs/ext2_lookup.cWed Apr 27 18:25:35 2011 (r221128) @@ -57,9 +57,10 @@ #include fs/ext2fs/inode.h #include fs/ext2fs/ext2_mount.h -#include fs/ext2fs/ext2_extern.h #include fs/ext2fs/ext2fs.h +#include fs/ext2fs/ext2_dinode.h #include fs/ext2fs/ext2_dir.h +#include fs/ext2fs/ext2_extern.h #ifdef DIAGNOSTIC static int dirchk = 1; @@ -1056,7 +1057,7 @@ ext2_checkpath(source, target, cred) error = EEXIST; goto out; } - rootino = ROOTINO; + rootino = EXT2_ROOTINO; error = 0; if (target-i_number == rootino) goto out; Modified: head/sys/fs/ext2fs/ext2_vfsops.c == --- head/sys/fs/ext2fs/ext2_vfsops.cWed Apr 27 18:19:26 2011 (r221127) +++ head/sys/fs/ext2fs/ext2_vfsops.cWed Apr 27 18:25:35 2011 (r221128) @@ -983,7 +983,7 @@ ext2_fhtovp(struct mount *mp, struct fid ufhp = (struct ufid *)fhp; fs = VFSTOEXT2(mp)-um_e2fs; - if (ufhp-ufid_ino ROOTINO || + if (ufhp-ufid_ino EXT2_ROOTINO || ufhp-ufid_ino fs-e2fs_gcount * fs-e2fs-e2fs_ipg) return (ESTALE); @@ -1063,7 +1063,7 @@ ext2_root(struct mount *mp, int flags, s struct vnode *nvp; int error; - error = VFS_VGET(mp, (ino_t)ROOTINO, LK_EXCLUSIVE, nvp); + error = VFS_VGET(mp, EXT2_ROOTINO, LK_EXCLUSIVE, nvp); if (error) return (error); *vpp = nvp; Modified: head/sys/fs/ext2fs/ext2_vnops.c == --- head/sys/fs/ext2fs/ext2_vnops.c Wed Apr 27 18:19:26 2011 (r221127) +++ head/sys/fs/ext2fs/ext2_vnops.c Wed Apr 27 18:25:35 2011 (r221128) @@ -71,12 +71,13 @@ #include ufs/ufs/dir.h -#include fs/ext2fs/inode.h -#include fs/ext2fs/ext2_mount.h #include fs/ext2fs/fs.h +#include fs/ext2fs/inode.h #include fs/ext2fs/ext2_extern.h #include fs/ext2fs/ext2fs.h +#include fs/ext2fs/ext2_dinode.h #include fs/ext2fs/ext2_dir.h +#include fs/ext2fs/ext2_mount.h static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *); static void ext2_itimes_locked(struct vnode *); @@ -1581,7 +1582,7 @@ ext2_vinit(mntp, fifoops, vpp) if (vp-v_type == VFIFO) vp-v_op = fifoops; - if (ip-i_number == ROOTINO) + if (ip-i_number == EXT2_ROOTINO) vp-v_vflag |= VV_ROOT; ip-i_modrev = init_va_filerev(); *vpp = vp; Modified: head/sys/fs/ext2fs/inode.h == --- head/sys/fs/ext2fs/inode.h Wed Apr 27 18:19:26 2011(r221127) +++ head/sys/fs/ext2fs/inode.h Wed Apr 27 18:25:35 2011(r221128) @@ -41,8 +41,6 @@ #include sys/lock.h #include sys/queue.h -#defineROOTINO ((ino_t)2) - #defineNDADDR 12 /* Direct addresses in inode. */ #defineNIADDR 3 /* Indirect addresses in inode. */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221124 - in head: . sbin/mount sbin/mount_nfs sys/amd64/conf sys/fs/nfsclient sys/i386/conf sys/ia64/conf sys/nfsclient sys/pc98/conf sys/powerpc/conf sys/sparc64/conf sys/sun4v/conf
On Apr 27, 2011, at 5:51 PM, Rick Macklem wrote: Author: rmacklem Date: Wed Apr 27 17:51:51 2011 New Revision: 221124 URL: http://svn.freebsd.org/changeset/base/221124 Log: This patch changes head so that the default NFS client is now the new NFS client (which I guess is no longer experimental). The fstype newnfs is now nfs and the regular/old NFS client is now fstype oldnfs. Wooohooo! Thanks a lot for all the hard work! :) Bjoern -- Bjoern A. Zeeb You have to have visions! Stop bit received. Insert coin for new address family. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221129 - in head/sys: netinet6 netipsec
Author: bz
Date: Wed Apr 27 19:28:42 2011
New Revision: 221129
URL: http://svn.freebsd.org/changeset/base/221129
Log:
Make IPsec compile without INET adding appropriate #ifdef checks.
Unfold the IPSEC_COMMON_INPUT_CB() macro in xform_{ah,esp,ipcomp}.c
to not need three different versions depending on INET, INET6 or both.
Mark two places preparing for not yet supported functionality with IPv6.
Reviewed by: gnn
Sponsored by: The FreeBSD Foundation
Sponsored by: iXsystems
MFC after:4 days
Modified:
head/sys/netinet6/ip6_ipsec.c
head/sys/netipsec/ipsec_input.c
head/sys/netipsec/ipsec_output.c
head/sys/netipsec/key.c
head/sys/netipsec/xform_ah.c
head/sys/netipsec/xform_esp.c
head/sys/netipsec/xform_ipcomp.c
head/sys/netipsec/xform_ipip.c
Modified: head/sys/netinet6/ip6_ipsec.c
==
--- head/sys/netinet6/ip6_ipsec.c Wed Apr 27 18:25:35 2011
(r221128)
+++ head/sys/netinet6/ip6_ipsec.c Wed Apr 27 19:28:42 2011
(r221129)
@@ -30,6 +30,7 @@
#include sys/cdefs.h
__FBSDID($FreeBSD$);
+#include opt_inet.h
#include opt_inet6.h
#include opt_ipsec.h
@@ -43,6 +44,7 @@ __FBSDID($FreeBSD$);
#include sys/socket.h
#include sys/socketvar.h
#include sys/sysctl.h
+#include sys/syslog.h
#include net/if.h
#include net/route.h
@@ -291,7 +293,11 @@ ip6_ipsec_output(struct mbuf **m, struct
* this is done in the normal processing path.
*/
if ((*m)-m_pkthdr.csum_flags CSUM_DELAY_DATA) {
+ ipseclog((LOG_DEBUG,
+ %s: we do not support IPv4 over IPv6, __func__));
+#ifdef INET
in_delayed_cksum(*m);
+#endif
(*m)-m_pkthdr.csum_flags = ~CSUM_DELAY_DATA;
}
Modified: head/sys/netipsec/ipsec_input.c
==
--- head/sys/netipsec/ipsec_input.c Wed Apr 27 18:25:35 2011
(r221128)
+++ head/sys/netipsec/ipsec_input.c Wed Apr 27 19:28:42 2011
(r221129)
@@ -119,9 +119,11 @@ ipsec_common_input(struct mbuf *m, int s
struct secasvar *sav;
u_int32_t spi;
int error;
+#ifdef INET
#ifdef IPSEC_NAT_T
struct m_tag *tag;
#endif
+#endif
IPSEC_ISTAT(sproto, V_espstat.esps_input, V_ahstat.ahs_input,
V_ipcompstat.ipcomps_input);
Modified: head/sys/netipsec/ipsec_output.c
==
--- head/sys/netipsec/ipsec_output.cWed Apr 27 18:25:35 2011
(r221128)
+++ head/sys/netipsec/ipsec_output.cWed Apr 27 19:28:42 2011
(r221129)
@@ -165,7 +165,29 @@ ipsec_process_done(struct mbuf *m, struc
*/
if (isr-next) {
V_ipsec4stat.ips_out_bundlesa++;
- return ipsec4_process_packet(m, isr-next, 0, 0);
+ sav = isr-next-sav;
+ saidx = sav-sah-saidx;
+ switch (saidx-dst.sa.sa_family) {
+#ifdef INET
+ case AF_INET:
+ return ipsec4_process_packet(m, isr-next, 0, 0);
+ /* NOTREACHED */
+#endif
+#ifdef notyet
+#ifdef INET6
+ case AF_INET6:
+ /* XXX */
+ ipsec6_output_trans()
+ ipsec6_output_tunnel()
+ /* NOTREACHED */
+#endif /* INET6 */
+#endif
+ default:
+ DPRINTF((%s: unknown protocol family %u\n, __func__,
+ saidx-dst.sa.sa_family));
+ error = ENXIO;
+ goto bad;
+ }
}
key_sa_recordxfer(sav, m); /* record data transfer */
Modified: head/sys/netipsec/key.c
==
--- head/sys/netipsec/key.c Wed Apr 27 18:25:35 2011(r221128)
+++ head/sys/netipsec/key.c Wed Apr 27 19:28:42 2011(r221129)
@@ -73,7 +73,7 @@
#include netinet6/ip6_var.h
#endif /* INET6 */
-#ifdef INET
+#if defined(INET) || defined(INET6)
#include netinet/in_pcb.h
#endif
#ifdef INET6
Modified: head/sys/netipsec/xform_ah.c
==
--- head/sys/netipsec/xform_ah.cWed Apr 27 18:25:35 2011
(r221128)
+++ head/sys/netipsec/xform_ah.cWed Apr 27 19:28:42 2011
(r221129)
@@ -91,6 +91,7 @@ VNET_DEFINE(int, ah_enable) = 1; /* cont
VNET_DEFINE(int, ah_cleartos) = 1; /* clear ip_tos when doing AH calc */
VNET_DEFINE(struct ahstat, ahstat);
+#ifdef INET
SYSCTL_DECL(_net_inet_ah);
SYSCTL_VNET_INT(_net_inet_ah, OID_AUTO,
ah_enable, CTLFLAG_RW, VNET_NAME(ah_enable), 0, );
@@ -98,6 +99,7 @@ SYSCTL_VNET_INT(_net_inet_ah, OID_AUTO,
ah_cleartos,
svn commit: r221130 - in head/sys: dev/xen/netfront net netinet
Author: bz
Date: Wed Apr 27 19:30:44 2011
New Revision: 221130
URL: http://svn.freebsd.org/changeset/base/221130
Log:
Make various (pseudo) interfaces compile without INET in the kernel
adding appropriate #ifdefs. For module builds the framework needs
adjustments for at least carp.
Reviewed by: gnn
Sponsored by: The FreeBSD Foundation
Sponsored by: iXsystems
MFC after:4 days
Modified:
head/sys/dev/xen/netfront/netfront.c
head/sys/net/if_enc.c
head/sys/net/if_lagg.c
head/sys/netinet/ip_carp.c
Modified: head/sys/dev/xen/netfront/netfront.c
==
--- head/sys/dev/xen/netfront/netfront.cWed Apr 27 19:28:42 2011
(r221129)
+++ head/sys/dev/xen/netfront/netfront.cWed Apr 27 19:30:44 2011
(r221130)
@@ -28,6 +28,8 @@
#include sys/cdefs.h
__FBSDID($FreeBSD$);
+#include opt_inet.h
+
#include sys/param.h
#include sys/systm.h
#include sys/sockio.h
@@ -625,6 +627,7 @@ setup_device(device_t dev, struct netfro
return (error);
}
+#ifdef INET
/**
* If this interface has an ipv4 address, send an arp for it. This
* helps to get the network going again after migrating hosts.
@@ -642,6 +645,7 @@ netfront_send_fake_arp(device_t dev, str
}
}
}
+#endif
/**
* Callback received when the backend's state changes.
@@ -668,7 +672,9 @@ netfront_backend_changed(device_t dev, X
if (network_connect(sc) != 0)
break;
xenbus_set_state(dev, XenbusStateConnected);
+#ifdef INET
netfront_send_fake_arp(dev, sc);
+#endif
break;
case XenbusStateClosing:
xenbus_set_state(dev, XenbusStateClosed);
@@ -1725,12 +1731,15 @@ xn_ioctl(struct ifnet *ifp, u_long cmd,
{
struct netfront_info *sc = ifp-if_softc;
struct ifreq *ifr = (struct ifreq *) data;
+#ifdef INET
struct ifaddr *ifa = (struct ifaddr *)data;
+#endif
int mask, error = 0;
switch(cmd) {
case SIOCSIFADDR:
case SIOCGIFADDR:
+#ifdef INET
XN_LOCK(sc);
if (ifa-ifa_addr-sa_family == AF_INET) {
ifp-if_flags |= IFF_UP;
@@ -1740,8 +1749,11 @@ xn_ioctl(struct ifnet *ifp, u_long cmd,
XN_UNLOCK(sc);
} else {
XN_UNLOCK(sc);
+#endif
error = ether_ioctl(ifp, cmd, data);
+#ifdef INET
}
+#endif
break;
case SIOCSIFMTU:
/* XXX can we alter the MTU on a VN ?*/
Modified: head/sys/net/if_enc.c
==
--- head/sys/net/if_enc.c Wed Apr 27 19:28:42 2011(r221129)
+++ head/sys/net/if_enc.c Wed Apr 27 19:30:44 2011(r221130)
@@ -27,6 +27,10 @@
* $FreeBSD$
*/
+#include opt_inet.h
+#include opt_inet6.h
+#include opt_enc.h
+
#include sys/param.h
#include sys/systm.h
#include sys/kernel.h
@@ -53,14 +57,12 @@
#include netinet/ip.h
#include netinet/ip_var.h
#include netinet/in_var.h
-#include opt_inet6.h
#ifdef INET6
#include netinet/ip6.h
#include netinet6/ip6_var.h
#endif
-#include opt_enc.h
#include netipsec/ipsec.h
#include netipsec/xform.h
@@ -243,11 +245,14 @@ ipsec_filter(struct mbuf **mp, int dir,
}
/* Skip pfil(9) if no filters are loaded */
- if (!(PFIL_HOOKED(V_inet_pfil_hook)
+ if (1
+#ifdef INET
+!PFIL_HOOKED(V_inet_pfil_hook)
+#endif
#ifdef INET6
- || PFIL_HOOKED(V_inet6_pfil_hook)
+!PFIL_HOOKED(V_inet6_pfil_hook)
#endif
- )) {
+ ) {
return (0);
}
@@ -263,6 +268,7 @@ ipsec_filter(struct mbuf **mp, int dir,
error = 0;
ip = mtod(*mp, struct ip *);
switch (ip-ip_v) {
+#ifdef INET
case 4:
/*
* before calling the firewall, swap fields the same as
@@ -282,7 +288,7 @@ ipsec_filter(struct mbuf **mp, int dir,
ip-ip_len = htons(ip-ip_len);
ip-ip_off = htons(ip-ip_off);
break;
-
+#endif
#ifdef INET6
case 6:
error = pfil_run_hooks(V_inet6_pfil_hook, mp,
Modified: head/sys/net/if_lagg.c
==
--- head/sys/net/if_lagg.c Wed Apr 27 19:28:42 2011(r221129)
+++ head/sys/net/if_lagg.c Wed Apr 27 19:30:44 2011(r221130)
@@ -52,8 +52,10 @@ __FBSDID($FreeBSD$);
#include net/if_var.h
#include net/bpf.h
-#ifdef INET
+#if defined(INET) || defined(INET6)
#include netinet/in.h
+#endif
+#ifdef INET
#include netinet/in_systm.h
#include netinet/if_ether.h
#include netinet/ip.h
Modified: head/sys/netinet/ip_carp.c
svn commit: r221131 - head/sys/netinet
Author: bz Date: Wed Apr 27 19:32:27 2011 New Revision: 221131 URL: http://svn.freebsd.org/changeset/base/221131 Log: MfP4 CH=192004: Move ip_defttl to raw_ip.c where it is actually used. In an IPv6 only world we do not want to compile ip_input.c in for that and it is a shared default with INET6. Reviewed by: gnn Sponsored by: The FreeBSD Foundation Sponsored by: iXsystems MFC after:4 days Modified: head/sys/netinet/ip_input.c head/sys/netinet/raw_ip.c Modified: head/sys/netinet/ip_input.c == --- head/sys/netinet/ip_input.c Wed Apr 27 19:30:44 2011(r221130) +++ head/sys/netinet/ip_input.c Wed Apr 27 19:32:27 2011(r221131) @@ -101,11 +101,6 @@ SYSCTL_VNET_INT(_net_inet_ip, IPCTL_SEND VNET_NAME(ipsendredirects), 0, Enable sending IP redirects); -VNET_DEFINE(int, ip_defttl) = IPDEFTTL; -SYSCTL_VNET_INT(_net_inet_ip, IPCTL_DEFTTL, ttl, CTLFLAG_RW, -VNET_NAME(ip_defttl), 0, -Maximum TTL on IP packets); - static VNET_DEFINE(int, ip_keepfaith); #defineV_ip_keepfaith VNET(ip_keepfaith) SYSCTL_VNET_INT(_net_inet_ip, IPCTL_KEEPFAITH, keepfaith, CTLFLAG_RW, Modified: head/sys/netinet/raw_ip.c == --- head/sys/netinet/raw_ip.c Wed Apr 27 19:30:44 2011(r221130) +++ head/sys/netinet/raw_ip.c Wed Apr 27 19:32:27 2011(r221131) @@ -74,6 +74,11 @@ __FBSDID($FreeBSD$); #include security/mac/mac_framework.h +VNET_DEFINE(int, ip_defttl) = IPDEFTTL; +SYSCTL_VNET_INT(_net_inet_ip, IPCTL_DEFTTL, ttl, CTLFLAG_RW, +VNET_NAME(ip_defttl), 0, +Maximum TTL on IP packets); + VNET_DEFINE(struct inpcbhead, ripcb); VNET_DEFINE(struct inpcbinfo, ripcbinfo); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221132 - head/sys/contrib/pf/net
Author: bz
Date: Wed Apr 27 19:34:01 2011
New Revision: 221132
URL: http://svn.freebsd.org/changeset/base/221132
Log:
Make pf compile without INET support by adding #ifdef INETs and
correcting few #includes.
Reviewed by: gnn
Sponsored by: The FreeBSD Foundation
Sponsored by: iXsystems
MFC after:4 days
Modified:
head/sys/contrib/pf/net/if_pflog.c
head/sys/contrib/pf/net/pf.c
head/sys/contrib/pf/net/pf_ioctl.c
Modified: head/sys/contrib/pf/net/if_pflog.c
==
--- head/sys/contrib/pf/net/if_pflog.c Wed Apr 27 19:32:27 2011
(r221131)
+++ head/sys/contrib/pf/net/if_pflog.c Wed Apr 27 19:34:01 2011
(r221132)
@@ -82,17 +82,17 @@ __FBSDID($FreeBSD$);
#include net/route.h
#include net/bpf.h
-#ifdef INET
+#if defined(INET) || defined(INET6)
#include netinet/in.h
+#endif
+#ifdef INET
#include netinet/in_var.h
#include netinet/in_systm.h
#include netinet/ip.h
#endif
#ifdef INET6
-#ifndef INET
-#include netinet/in.h
-#endif
+#include netinet6/in6_var.h
#include netinet6/nd6.h
#endif /* INET6 */
Modified: head/sys/contrib/pf/net/pf.c
==
--- head/sys/contrib/pf/net/pf.cWed Apr 27 19:32:27 2011
(r221131)
+++ head/sys/contrib/pf/net/pf.cWed Apr 27 19:34:01 2011
(r221132)
@@ -2039,8 +2039,10 @@ pf_send_icmp(struct mbuf *m, u_int8_t ty
struct pf_mtag *pf_mtag;
struct mbuf *m0;
#ifdef __FreeBSD__
+#ifdef INET
struct ip *ip;
#endif
+#endif
#ifdef __FreeBSD__
m0 = m_copypacket(m, M_DONTWAIT);
Modified: head/sys/contrib/pf/net/pf_ioctl.c
==
--- head/sys/contrib/pf/net/pf_ioctl.c Wed Apr 27 19:32:27 2011
(r221131)
+++ head/sys/contrib/pf/net/pf_ioctl.c Wed Apr 27 19:34:01 2011
(r221132)
@@ -216,10 +216,12 @@ static voidpf_clear_srcnodes(void);
/*
* Wrapper functions for pfil(9) hooks
*/
+#ifdef INET
static int pf_check_in(void *arg, struct mbuf **m, struct ifnet *ifp,
int dir, struct inpcb *inp);
static int pf_check_out(void *arg, struct mbuf **m, struct ifnet *ifp,
int dir, struct inpcb *inp);
+#endif
#ifdef INET6
static int pf_check6_in(void *arg, struct mbuf **m, struct ifnet *ifp,
int dir, struct inpcb *inp);
@@ -3622,6 +3624,7 @@ shutdown_pf(void)
return (error);
}
+#ifdef INET
static int
pf_check_in(void *arg, struct mbuf **m, struct ifnet *ifp, int dir,
struct inpcb *inp)
@@ -3696,6 +3699,7 @@ pf_check_out(void *arg, struct mbuf **m,
}
return chk;
}
+#endif
#ifdef INET6
static int
@@ -3761,15 +3765,19 @@ hook_pf(void)
pfh_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
if (pfh_inet == NULL)
return (ESRCH); /* XXX */
+#ifdef INET
pfil_add_hook(pf_check_in, NULL, PFIL_IN | PFIL_WAITOK, pfh_inet);
pfil_add_hook(pf_check_out, NULL, PFIL_OUT | PFIL_WAITOK, pfh_inet);
+#endif
#ifdef INET6
pfh_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6);
if (pfh_inet6 == NULL) {
+#ifdef INET
pfil_remove_hook(pf_check_in, NULL, PFIL_IN | PFIL_WAITOK,
pfh_inet);
pfil_remove_hook(pf_check_out, NULL, PFIL_OUT | PFIL_WAITOK,
pfh_inet);
+#endif
return (ESRCH); /* XXX */
}
pfil_add_hook(pf_check6_in, NULL, PFIL_IN | PFIL_WAITOK, pfh_inet6);
@@ -3796,10 +3804,12 @@ dehook_pf(void)
pfh_inet = pfil_head_get(PFIL_TYPE_AF, AF_INET);
if (pfh_inet == NULL)
return (ESRCH); /* XXX */
+#ifdef INET
pfil_remove_hook(pf_check_in, NULL, PFIL_IN | PFIL_WAITOK,
pfh_inet);
pfil_remove_hook(pf_check_out, NULL, PFIL_OUT | PFIL_WAITOK,
pfh_inet);
+#endif
#ifdef INET6
pfh_inet6 = pfil_head_get(PFIL_TYPE_AF, AF_INET6);
if (pfh_inet6 == NULL)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221053 - head/usr.bin/rlogin
On Wed, Apr 27, 2011 at 10:48:33AM -0400, John Baldwin wrote: For changing WARNS, 'make universe' works well I have to disagree. Due to its silent failing, it is only suitable for what PHK added it for -- what if changes. [Message-ID: 13101.1227520...@critter.freebsd.dk] One has to do all the various greps of the output in order to be confident of their belief of the results. We really need a new target that builds more normal (fails on first error) and makes it obvious when there is a failure. -- -- David (obr...@freebsd.org) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221133 - in stable/8/sys: mips/alchemy mips/sibyte powerpc/booke
Author: jhb
Date: Wed Apr 27 19:36:00 2011
New Revision: 221133
URL: http://svn.freebsd.org/changeset/base/221133
Log:
MFC: Various small compile nits found by make universe that are in already
merged changes or larger changes not suitable for MFC.
Modified:
stable/8/sys/mips/alchemy/obio.c
stable/8/sys/mips/sibyte/sb_zbbus.c
stable/8/sys/powerpc/booke/platform_bare.c
Modified: stable/8/sys/mips/alchemy/obio.c
==
--- stable/8/sys/mips/alchemy/obio.cWed Apr 27 19:34:01 2011
(r221132)
+++ stable/8/sys/mips/alchemy/obio.cWed Apr 27 19:36:00 2011
(r221133)
@@ -101,7 +101,7 @@ int irq_priorities[NIRQS] = {
static int obio_activate_resource(device_t, device_t, int, int,
struct resource *);
-static device_tobio_add_child(device_t, int, const char *, int);
+static device_tobio_add_child(device_t, u_int, const char *, int);
static struct resource *
obio_alloc_resource(device_t, device_t, int, int *, u_long,
u_long, u_long, u_int);
@@ -472,7 +472,7 @@ obio_hinted_child(device_t bus, const ch
}
static device_t
-obio_add_child(device_t bus, int order, const char *name, int unit)
+obio_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_tchild;
struct obio_ivar*ivar;
Modified: stable/8/sys/mips/sibyte/sb_zbbus.c
==
--- stable/8/sys/mips/sibyte/sb_zbbus.c Wed Apr 27 19:34:01 2011
(r221132)
+++ stable/8/sys/mips/sibyte/sb_zbbus.c Wed Apr 27 19:36:00 2011
(r221133)
@@ -402,7 +402,7 @@ zbbus_setup_intr(device_t dev, device_t
}
static device_t
-zbbus_add_child(device_t bus, int order, const char *name, int unit)
+zbbus_add_child(device_t bus, u_int order, const char *name, int unit)
{
device_t child;
struct zbbus_devinfo *dinfo;
Modified: stable/8/sys/powerpc/booke/platform_bare.c
==
--- stable/8/sys/powerpc/booke/platform_bare.c Wed Apr 27 19:34:01 2011
(r221132)
+++ stable/8/sys/powerpc/booke/platform_bare.c Wed Apr 27 19:36:00 2011
(r221133)
@@ -79,7 +79,7 @@ static platform_method_t bare_methods[]
PLATFORMMETHOD(platform_smp_get_bsp,bare_smp_get_bsp),
PLATFORMMETHOD(platform_smp_start_cpu, bare_smp_start_cpu),
- PLATFORMMETHOD(platform_reset, e500_reset);
+ PLATFORMMETHOD(platform_reset, e500_reset),
{ 0, 0 }
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221134 - in head/sys: conf netinet
Author: bz Date: Wed Apr 27 19:36:35 2011 New Revision: 221134 URL: http://svn.freebsd.org/changeset/base/221134 Log: MfP4 CH=192029: Expose ip_icmp.c to INET6 as well and only export badport_bandlim() along with the two sysctls in the non-INET case. The bandlim types work for all cases I reviewed in IPv6 as well and the sysctls are available as we export net.inet.* from in_proto.c. Reviewed by: gnn Sponsored by: The FreeBSD Foundation Sponsored by: iXsystems MFC after:4 days Modified: head/sys/conf/files head/sys/netinet/ip_icmp.c Modified: head/sys/conf/files == --- head/sys/conf/files Wed Apr 27 19:36:00 2011(r221133) +++ head/sys/conf/files Wed Apr 27 19:36:35 2011(r221134) @@ -2707,7 +2707,7 @@ netinet/ipfw/ip_fw_pfil.c optional inet netinet/ipfw/ip_fw_sockopt.c optional inet ipfirewall netinet/ipfw/ip_fw_table.c optional inet ipfirewall netinet/ipfw/ip_fw_nat.c optional inet ipfirewall_nat -netinet/ip_icmp.c optional inet +netinet/ip_icmp.c optional inet | inet6 netinet/ip_input.c optional inet netinet/ip_ipsec.c optional inet ipsec netinet/ip_mroute.coptional mrouting inet | mrouting inet6 Modified: head/sys/netinet/ip_icmp.c == --- head/sys/netinet/ip_icmp.c Wed Apr 27 19:36:00 2011(r221133) +++ head/sys/netinet/ip_icmp.c Wed Apr 27 19:36:35 2011(r221134) @@ -32,6 +32,7 @@ #include sys/cdefs.h __FBSDID($FreeBSD$); +#include opt_inet.h #include opt_ipsec.h #include sys/param.h @@ -62,6 +63,7 @@ __FBSDID($FreeBSD$); #include netinet/tcpip.h #include netinet/icmp_var.h +#ifdef INET #ifdef IPSEC #include netipsec/ipsec.h #include netipsec/key.h @@ -70,12 +72,26 @@ __FBSDID($FreeBSD$); #include machine/in_cksum.h #include security/mac/mac_framework.h +#endif /* INET */ /* * ICMP routines: error generation, receive packet processing, and * routines to turnaround packets back to the originator, and * host table maintenance routines. */ +static VNET_DEFINE(int, icmplim) = 200; +#defineV_icmplim VNET(icmplim) +SYSCTL_VNET_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_RW, + VNET_NAME(icmplim), 0, + Maximum number of ICMP responses per second); + +static VNET_DEFINE(int, icmplim_output) = 1; +#defineV_icmplim_outputVNET(icmplim_output) +SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO, icmplim_output, CTLFLAG_RW, + VNET_NAME(icmplim_output), 0, + Enable rate limiting of ICMP responses); + +#ifdef INET VNET_DEFINE(struct icmpstat, icmpstat); SYSCTL_VNET_STRUCT(_net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RW, VNET_NAME(icmpstat), icmpstat, ); @@ -104,18 +120,6 @@ SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO VNET_NAME(log_redirect), 0, Log ICMP redirects to the console); -static VNET_DEFINE(int, icmplim) = 200; -#defineV_icmplim VNET(icmplim) -SYSCTL_VNET_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_RW, - VNET_NAME(icmplim), 0, - Maximum number of ICMP responses per second); - -static VNET_DEFINE(int, icmplim_output) = 1; -#defineV_icmplim_outputVNET(icmplim_output) -SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO, icmplim_output, CTLFLAG_RW, - VNET_NAME(icmplim_output), 0, - Enable rate limiting of ICMP responses); - static VNET_DEFINE(char, reply_src[IFNAMSIZ]); #defineV_reply_src VNET(reply_src) SYSCTL_VNET_STRING(_net_inet_icmp, OID_AUTO, reply_src, CTLFLAG_RW, @@ -922,6 +926,7 @@ ip_next_mtu(int mtu, int dir) } return 0; } +#endif /* INET */ /* ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221053 - head/usr.bin/rlogin
On Tue, Apr 26, 2011 at 07:27:11AM -0600, Warner Losh wrote: I read the test log as not really tested, feel free to back it out if it fails on a different architecture Irregardless of the reasons for a build break -- one should feel free to fix or back the change out until the change can be revisited. :) :-)) -- -- David (obr...@freebsd.org) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221053 - head/usr.bin/rlogin
On Wednesday, April 27, 2011 3:35:50 pm David O'Brien wrote: On Wed, Apr 27, 2011 at 10:48:33AM -0400, John Baldwin wrote: For changing WARNS, 'make universe' works well I have to disagree. Due to its silent failing, it is only suitable for what PHK added it for -- what if changes. [Message-ID: 13101.1227520...@critter.freebsd.dk] One has to do all the various greps of the output in order to be confident of their belief of the results. We really need a new target that builds more normal (fails on first error) and makes it obvious when there is a failure. make tinderbox already does this. It gives you a nice summary at the end if anything failed. If things do fail, yes, you have to look in the listed files to find the errors, but 'make tinderbox' tells you exactly which files to check. For example: -- make universe completed on Wed Apr 27 15:05:23 EDT 2011 (started Wed Apr 27 14:09:08 EDT 2011) -- Tinderbox failed: mips AR71XX kernel failed, check _.mips.AR71XX for details mips MALTA64 kernel failed, check _.mips.MALTA64 for details -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221135 - in stable/8/sbin: hastctl hastd
Author: trociny
Date: Wed Apr 27 19:46:57 2011
New Revision: 221135
URL: http://svn.freebsd.org/changeset/base/221135
Log:
MFC r220520, r220521, r220522, r220523, r220573, r220744, r220865,
r220889, r220890, r220898, r220899:
r220520:
hastd(8) maintains a map of dirty extents, not hastctl(8). Fix this.
r220521:
Fix a typo in comments.
r220522:
In hast_proto_recv_data() check that the size of the data to be
received does not exceed the buffer size.
r220573 (pjd):
The replication mode that is currently support is fullsync, not memsync.
Correct this and print a warning if different replication mode is
configured.
r220523, r220744:
Remove hast_proto_recv(). It was used only in one place, where
hast_proto_recv_hdr() may be used.
r220865 (pjd):
Scenario:
- We have two nodes connected and synchronized (local counters on both sides
are 0).
- We take secondary down and recreate it.
- Primary connects to it and starts synchronization (but local counters are
still 0).
- We switch the roles.
- Synchronization restarts but data is synchronized now from new primary
(because local counters are 0) that doesn't have new data yet.
This fix this issue we bump local counter on primary when we discover that
connected secondary was recreated and has no data yet.
Reported by:trociny
Discussed with: trociny
Tested by: trociny
r220889 (pjd):
Timeout must be positive.
r220890 (pjd):
If we act in different role than requested by the remote node, log it
as a warning and not an error.
MFC after: 1 week
r220898 (pjd), r220899 (pjd):
When we become primary, we connect to the remote and expect it to be in
secondary role. It is possible that the remote node is primary, but only
because there was a role change and it didn't finish cleaning up (unmounting
file systems, etc.). If we detect such situation, wait for the remote node
to switch the role to secondary before accepting I/Os. If we don't wait for
it in that case, we will most likely cause split-brain.
Approved by: pjd (mentor)
Modified:
stable/8/sbin/hastctl/hastctl.8
stable/8/sbin/hastctl/hastctl.c
stable/8/sbin/hastd/activemap.c
stable/8/sbin/hastd/hast_proto.c
stable/8/sbin/hastd/hast_proto.h
stable/8/sbin/hastd/hastd.c
stable/8/sbin/hastd/parse.y
stable/8/sbin/hastd/primary.c
stable/8/sbin/hastd/secondary.c
Directory Properties:
stable/8/sbin/hastctl/ (props changed)
stable/8/sbin/hastd/ (props changed)
Modified: stable/8/sbin/hastctl/hastctl.8
==
--- stable/8/sbin/hastctl/hastctl.8 Wed Apr 27 19:36:35 2011
(r221134)
+++ stable/8/sbin/hastctl/hastctl.8 Wed Apr 27 19:46:57 2011
(r221135)
@@ -27,7 +27,7 @@
.\
.\ $FreeBSD$
.\
-.Dd March 13, 2011
+.Dd April 10, 2011
.Dt HASTCTL 8
.Os
.Sh NAME
@@ -88,7 +88,7 @@ Additional options include:
.It Fl e Ar extentsize
Size of an extent.
Extent is a block which is used for synchronization.
-.Nm
+.Xr hastd 8
maintains a map of dirty extents and extent is the smallest region that
can be marked as dirty.
If any part of an extent is modified, entire extent will be synchronized
Modified: stable/8/sbin/hastctl/hastctl.c
==
--- stable/8/sbin/hastctl/hastctl.c Wed Apr 27 19:36:35 2011
(r221134)
+++ stable/8/sbin/hastctl/hastctl.c Wed Apr 27 19:46:57 2011
(r221135)
@@ -492,7 +492,7 @@ main(int argc, char *argv[])
}
nv_free(nv);
/* ...and receive reply. */
- if (hast_proto_recv(NULL, controlconn, nv, NULL, 0) 0) {
+ if (hast_proto_recv_hdr(controlconn, nv) 0) {
pjdlog_exit(EX_UNAVAILABLE,
cannot receive reply from hastd via %s,
cfg-hc_controladdr);
Modified: stable/8/sbin/hastd/activemap.c
==
--- stable/8/sbin/hastd/activemap.c Wed Apr 27 19:36:35 2011
(r221134)
+++ stable/8/sbin/hastd/activemap.c Wed Apr 27 19:46:57 2011
(r221135)
@@ -470,7 +470,7 @@ activemap_copyin(struct activemap *amp,
}
/*
- * Function merges the given bitmap with existng one.
+ * Function merges the given bitmap with existing one.
*/
void
activemap_merge(struct activemap *amp, const unsigned char *buf, size_t size)
Modified: stable/8/sbin/hastd/hast_proto.c
==
--- stable/8/sbin/hastd/hast_proto.cWed Apr 27 19:36:35 2011
(r221134)
+++ stable/8/sbin/hastd/hast_proto.cWed Apr 27 19:46:57 2011
(r221135)
@@ -189,9 +189,12 @@ hast_proto_recv_data(const struct hast_r
dptr = data;
dsize = nv_get_uint32(nv, size);
- if (dsize == 0)
+ if (dsize
Re: svn commit: r221053 - head/usr.bin/rlogin
see make tinderbox if you want first fail semantics. On Apr 27, 2011, at 1:35 PM, David O'Brien wrote: On Wed, Apr 27, 2011 at 10:48:33AM -0400, John Baldwin wrote: For changing WARNS, 'make universe' works well I have to disagree. Due to its silent failing, it is only suitable for what PHK added it for -- what if changes. [Message-ID: 13101.1227520...@critter.freebsd.dk] One has to do all the various greps of the output in order to be confident of their belief of the results. We really need a new target that builds more normal (fails on first error) and makes it obvious when there is a failure. -- -- David (obr...@freebsd.org) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221138 - head/sys/dev/pci
Author: jhb
Date: Wed Apr 27 20:08:44 2011
New Revision: 221138
URL: http://svn.freebsd.org/changeset/base/221138
Log:
Only align MSI message groups based on the number of messages being
allocated, not the maximum number of messages the device supports. The
spec only requires the former, and I believe I implemented the latter due
to misunderstanding an e-mail. In particular, this fixes an issue where
having several devices that all support 16 messages can run out of
IDT vectors on x86 even though the driver only uses a single message.
Submitted by: Bret Ketchum bcketchum of gmail
MFC after:1 week
Modified:
head/sys/dev/pci/pci.c
Modified: head/sys/dev/pci/pci.c
==
--- head/sys/dev/pci/pci.c Wed Apr 27 19:54:45 2011(r221137)
+++ head/sys/dev/pci/pci.c Wed Apr 27 20:08:44 2011(r221138)
@@ -1969,7 +1969,7 @@ pci_alloc_msi_method(device_t dev, devic
for (;;) {
/* Try to allocate N messages. */
error = PCIB_ALLOC_MSI(device_get_parent(dev), child, actual,
- cfg-msi.msi_msgnum, irqs);
+ actual, irqs);
if (error == 0)
break;
if (actual == 1)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221139 - in head: etc/rc.d sys/fs/nfsclient sys/nfsclient
Author: rmacklem
Date: Wed Apr 27 20:42:30 2011
New Revision: 221139
URL: http://svn.freebsd.org/changeset/base/221139
Log:
Fix module names and dependencies so the NFS clients will
load correctly as modules after r221124.
Modified:
head/etc/rc.d/nfsclient
head/sys/fs/nfsclient/nfs_clvfsops.c
head/sys/nfsclient/nfs_vfsops.c
Modified: head/etc/rc.d/nfsclient
==
--- head/etc/rc.d/nfsclient Wed Apr 27 20:08:44 2011(r221138)
+++ head/etc/rc.d/nfsclient Wed Apr 27 20:42:30 2011(r221139)
@@ -13,7 +13,7 @@ name=nfsclient
rcvar=nfs_client_enable
start_cmd=nfsclient_start
stop_cmd=unmount_all
-required_modules=nfsclient:nfs
+required_modules=nfsclient:oldnfs
nfsclient_start()
{
Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==
--- head/sys/fs/nfsclient/nfs_clvfsops.cWed Apr 27 20:08:44 2011
(r221138)
+++ head/sys/fs/nfsclient/nfs_clvfsops.cWed Apr 27 20:42:30 2011
(r221139)
@@ -134,7 +134,11 @@ static struct vfsops nfs_vfsops = {
VFS_SET(nfs_vfsops, nfs, VFCF_NETWORK);
/* So that loader and kldload(2) can find us, wherever we are.. */
-MODULE_VERSION(newnfs, 1);
+MODULE_VERSION(nfs, 1);
+MODULE_DEPEND(nfs, nfscommon, 1, 1, 1);
+MODULE_DEPEND(nfs, krpc, 1, 1, 1);
+MODULE_DEPEND(nfs, nfssvc, 1, 1, 1);
+MODULE_DEPEND(nfs, nfslock, 1, 1, 1);
/*
* This structure is now defined in sys/nfs/nfs_diskless.c so that it
Modified: head/sys/nfsclient/nfs_vfsops.c
==
--- head/sys/nfsclient/nfs_vfsops.c Wed Apr 27 20:08:44 2011
(r221138)
+++ head/sys/nfsclient/nfs_vfsops.c Wed Apr 27 20:42:30 2011
(r221139)
@@ -147,13 +147,13 @@ static struct vfsops nfs_vfsops = {
VFS_SET(nfs_vfsops, oldnfs, VFCF_NETWORK);
/* So that loader and kldload(2) can find us, wherever we are.. */
-MODULE_VERSION(nfs, 1);
-MODULE_DEPEND(nfs, krpc, 1, 1, 1);
+MODULE_VERSION(oldnfs, 1);
+MODULE_DEPEND(oldnfs, krpc, 1, 1, 1);
#ifdef KGSSAPI
-MODULE_DEPEND(nfs, kgssapi, 1, 1, 1);
+MODULE_DEPEND(oldnfs, kgssapi, 1, 1, 1);
#endif
-MODULE_DEPEND(nfs, nfs_common, 1, 1, 1);
-MODULE_DEPEND(nfs, nfslock, 1, 1, 1);
+MODULE_DEPEND(oldnfs, nfs_common, 1, 1, 1);
+MODULE_DEPEND(oldnfs, nfslock, 1, 1, 1);
static struct nfs_rpcops nfs_rpcops = {
nfs_readrpc,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221140 - in stable/8/sys/dev: acpica pci
Author: jhb
Date: Wed Apr 27 21:13:20 2011
New Revision: 221140
URL: http://svn.freebsd.org/changeset/base/221140
Log:
MFC 210864:
- Retire acpi_pcib_resume(). It is has just been an alias for
bus_generic_resume() since the pci_link(4) driver was added.
- Change the ACPI PCI-PCI bridge driver to inherit most of its methods
from the generic PCI-PCI bridge driver.
- This also exposes the generic PCI-PCI bridge driver as pcib_driver so
other drivers can inherit from it.
Modified:
stable/8/sys/dev/acpica/acpi_pcib.c
stable/8/sys/dev/acpica/acpi_pcib_acpi.c
stable/8/sys/dev/acpica/acpi_pcib_pci.c
stable/8/sys/dev/acpica/acpi_pcibvar.h
stable/8/sys/dev/pci/pcib_private.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/acpica/acpi_pcib.c
==
--- stable/8/sys/dev/acpica/acpi_pcib.c Wed Apr 27 20:42:30 2011
(r221139)
+++ stable/8/sys/dev/acpica/acpi_pcib.c Wed Apr 27 21:13:20 2011
(r221140)
@@ -171,13 +171,6 @@ acpi_pcib_attach(device_t dev, ACPI_BUFF
return_VALUE (bus_generic_attach(dev));
}
-int
-acpi_pcib_resume(device_t dev)
-{
-
-return (bus_generic_resume(dev));
-}
-
static void
prt_lookup_device(ACPI_PCI_ROUTING_TABLE *entry, void *arg)
{
Modified: stable/8/sys/dev/acpica/acpi_pcib_acpi.c
==
--- stable/8/sys/dev/acpica/acpi_pcib_acpi.cWed Apr 27 20:42:30 2011
(r221139)
+++ stable/8/sys/dev/acpica/acpi_pcib_acpi.cWed Apr 27 21:13:20 2011
(r221140)
@@ -65,7 +65,6 @@ struct acpi_hpcib_softc {
static int acpi_pcib_acpi_probe(device_t bus);
static int acpi_pcib_acpi_attach(device_t bus);
-static int acpi_pcib_acpi_resume(device_t bus);
static int acpi_pcib_read_ivar(device_t dev, device_t child,
int which, uintptr_t *result);
static int acpi_pcib_write_ivar(device_t dev, device_t child,
@@ -94,7 +93,7 @@ static device_method_t acpi_pcib_acpi_me
DEVMETHOD(device_attach, acpi_pcib_acpi_attach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
DEVMETHOD(device_suspend, bus_generic_suspend),
-DEVMETHOD(device_resume, acpi_pcib_acpi_resume),
+DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
@@ -257,13 +256,6 @@ acpi_pcib_acpi_attach(device_t dev)
return (acpi_pcib_attach(dev, sc-ap_prt, sc-ap_bus));
}
-static int
-acpi_pcib_acpi_resume(device_t dev)
-{
-
-return (acpi_pcib_resume(dev));
-}
-
/*
* Support for standard PCI bridge ivars.
*/
Modified: stable/8/sys/dev/acpica/acpi_pcib_pci.c
==
--- stable/8/sys/dev/acpica/acpi_pcib_pci.c Wed Apr 27 20:42:30 2011
(r221139)
+++ stable/8/sys/dev/acpica/acpi_pcib_pci.c Wed Apr 27 21:13:20 2011
(r221140)
@@ -65,7 +65,6 @@ struct acpi_pcib_lookup_info {
static int acpi_pcib_pci_probe(device_t bus);
static int acpi_pcib_pci_attach(device_t bus);
-static int acpi_pcib_pci_resume(device_t bus);
static int acpi_pcib_read_ivar(device_t dev, device_t child,
int which, uintptr_t *result);
static int acpi_pcib_pci_route_interrupt(device_t pcib,
@@ -75,39 +74,20 @@ static device_method_t acpi_pcib_pci_met
/* Device interface */
DEVMETHOD(device_probe,acpi_pcib_pci_probe),
DEVMETHOD(device_attach, acpi_pcib_pci_attach),
-DEVMETHOD(device_shutdown, bus_generic_shutdown),
-DEVMETHOD(device_suspend, bus_generic_suspend),
-DEVMETHOD(device_resume, acpi_pcib_pci_resume),
/* Bus interface */
-DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, acpi_pcib_read_ivar),
-DEVMETHOD(bus_write_ivar, pcib_write_ivar),
-DEVMETHOD(bus_alloc_resource, pcib_alloc_resource),
-DEVMETHOD(bus_release_resource,bus_generic_release_resource),
-DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
-DEVMETHOD(bus_deactivate_resource,
bus_generic_deactivate_resource),
-DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
-DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
/* pcib interface */
-DEVMETHOD(pcib_maxslots, pcib_maxslots),
-DEVMETHOD(pcib_read_config,pcib_read_config),
-DEVMETHOD(pcib_write_config,
svn commit: r221141 - in stable/7/sys/dev: acpica pci
Author: jhb
Date: Wed Apr 27 21:13:40 2011
New Revision: 221141
URL: http://svn.freebsd.org/changeset/base/221141
Log:
MFC 210864:
- Retire acpi_pcib_resume(). It is has just been an alias for
bus_generic_resume() since the pci_link(4) driver was added.
- Change the ACPI PCI-PCI bridge driver to inherit most of its methods
from the generic PCI-PCI bridge driver.
- This also exposes the generic PCI-PCI bridge driver as pcib_driver so
other drivers can inherit from it.
Modified:
stable/7/sys/dev/acpica/acpi_pcib.c
stable/7/sys/dev/acpica/acpi_pcib_acpi.c
stable/7/sys/dev/acpica/acpi_pcib_pci.c
stable/7/sys/dev/acpica/acpi_pcibvar.h
stable/7/sys/dev/pci/pcib_private.h
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/dev/acpica/acpi_pcib.c
==
--- stable/7/sys/dev/acpica/acpi_pcib.c Wed Apr 27 21:13:20 2011
(r221140)
+++ stable/7/sys/dev/acpica/acpi_pcib.c Wed Apr 27 21:13:40 2011
(r221141)
@@ -170,13 +170,6 @@ acpi_pcib_attach(device_t dev, ACPI_BUFF
return_VALUE (bus_generic_attach(dev));
}
-int
-acpi_pcib_resume(device_t dev)
-{
-
-return (bus_generic_resume(dev));
-}
-
static void
prt_lookup_device(ACPI_PCI_ROUTING_TABLE *entry, void *arg)
{
Modified: stable/7/sys/dev/acpica/acpi_pcib_acpi.c
==
--- stable/7/sys/dev/acpica/acpi_pcib_acpi.cWed Apr 27 21:13:20 2011
(r221140)
+++ stable/7/sys/dev/acpica/acpi_pcib_acpi.cWed Apr 27 21:13:40 2011
(r221141)
@@ -63,7 +63,6 @@ struct acpi_hpcib_softc {
static int acpi_pcib_acpi_probe(device_t bus);
static int acpi_pcib_acpi_attach(device_t bus);
-static int acpi_pcib_acpi_resume(device_t bus);
static int acpi_pcib_read_ivar(device_t dev, device_t child,
int which, uintptr_t *result);
static int acpi_pcib_write_ivar(device_t dev, device_t child,
@@ -91,7 +90,7 @@ static device_method_t acpi_pcib_acpi_me
DEVMETHOD(device_attach, acpi_pcib_acpi_attach),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
DEVMETHOD(device_suspend, bus_generic_suspend),
-DEVMETHOD(device_resume, acpi_pcib_acpi_resume),
+DEVMETHOD(device_resume, bus_generic_resume),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),
@@ -250,13 +249,6 @@ acpi_pcib_acpi_attach(device_t dev)
return (acpi_pcib_attach(dev, sc-ap_prt, sc-ap_bus));
}
-static int
-acpi_pcib_acpi_resume(device_t dev)
-{
-
-return (acpi_pcib_resume(dev));
-}
-
/*
* Support for standard PCI bridge ivars.
*/
Modified: stable/7/sys/dev/acpica/acpi_pcib_pci.c
==
--- stable/7/sys/dev/acpica/acpi_pcib_pci.c Wed Apr 27 21:13:20 2011
(r221140)
+++ stable/7/sys/dev/acpica/acpi_pcib_pci.c Wed Apr 27 21:13:40 2011
(r221141)
@@ -63,7 +63,6 @@ struct acpi_pcib_lookup_info {
static int acpi_pcib_pci_probe(device_t bus);
static int acpi_pcib_pci_attach(device_t bus);
-static int acpi_pcib_pci_resume(device_t bus);
static int acpi_pcib_read_ivar(device_t dev, device_t child,
int which, uintptr_t *result);
static int acpi_pcib_pci_route_interrupt(device_t pcib,
@@ -73,39 +72,20 @@ static device_method_t acpi_pcib_pci_met
/* Device interface */
DEVMETHOD(device_probe,acpi_pcib_pci_probe),
DEVMETHOD(device_attach, acpi_pcib_pci_attach),
-DEVMETHOD(device_shutdown, bus_generic_shutdown),
-DEVMETHOD(device_suspend, bus_generic_suspend),
-DEVMETHOD(device_resume, acpi_pcib_pci_resume),
/* Bus interface */
-DEVMETHOD(bus_print_child, bus_generic_print_child),
DEVMETHOD(bus_read_ivar, acpi_pcib_read_ivar),
-DEVMETHOD(bus_write_ivar, pcib_write_ivar),
-DEVMETHOD(bus_alloc_resource, pcib_alloc_resource),
-DEVMETHOD(bus_release_resource,bus_generic_release_resource),
-DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
-DEVMETHOD(bus_deactivate_resource,
bus_generic_deactivate_resource),
-DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
-DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
/* pcib interface */
-DEVMETHOD(pcib_maxslots, pcib_maxslots),
-DEVMETHOD(pcib_read_config,pcib_read_config),
-DEVMETHOD(pcib_write_config, pcib_write_config),
DEVMETHOD(pcib_route_interrupt,
svn commit: r221142 - head/lib/libcrypt
Author: obrien
Date: Wed Apr 27 21:33:56 2011
New Revision: 221142
URL: http://svn.freebsd.org/changeset/base/221142
Log:
Protect the reachover built symbols after the SHA256/512 crypt(3) addition.
Modified:
head/lib/libcrypt/Makefile
Modified: head/lib/libcrypt/Makefile
==
--- head/lib/libcrypt/Makefile Wed Apr 27 21:13:40 2011(r221141)
+++ head/lib/libcrypt/Makefile Wed Apr 27 21:33:56 2011(r221142)
@@ -31,7 +31,9 @@ CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BL
SRCS+= auth.c property.c
.for sym in auth_getval property_find properties_read properties_free \
MD4Init MD4Final MD4Update MD4Pad \
- MD5Init MD5Final MD5Update MD5Pad
+ MD5Init MD5Final MD5Update MD5Pad \
+ SHA256_Init SHA256_Final SHA256_Update \
+ SHA512_Init SHA512_Final SHA512_Update
CFLAGS+= -D${sym}=__${sym}
.endfor
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221143 - head/sbin/mdconfig
Author: des
Date: Wed Apr 27 21:39:59 2011
New Revision: 221143
URL: http://svn.freebsd.org/changeset/base/221143
Log:
whitespace nit
Modified:
head/sbin/mdconfig/mdconfig.c
Modified: head/sbin/mdconfig/mdconfig.c
==
--- head/sbin/mdconfig/mdconfig.c Wed Apr 27 21:33:56 2011
(r221142)
+++ head/sbin/mdconfig/mdconfig.c Wed Apr 27 21:39:59 2011
(r221143)
@@ -294,7 +294,7 @@ main(int argc, char **argv)
}
if (action == LIST) {
if (mdio.md_options MD_AUTOUNIT) {
- /*
+ /*
* Listing all devices. This is why we pass NULL
* together with OPT_LIST.
*/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221144 - head/sbin/mdconfig
Author: des
Date: Wed Apr 27 21:40:49 2011
New Revision: 221144
URL: http://svn.freebsd.org/changeset/base/221144
Log:
whitespace nit - sorry for the churn
Modified:
head/sbin/mdconfig/mdconfig.c
Modified: head/sbin/mdconfig/mdconfig.c
==
--- head/sbin/mdconfig/mdconfig.c Wed Apr 27 21:39:59 2011
(r221143)
+++ head/sbin/mdconfig/mdconfig.c Wed Apr 27 21:40:49 2011
(r221144)
@@ -141,8 +141,8 @@ main(int argc, char **argv)
mdio.md_options = MD_CLUSTER | MD_AUTOUNIT |
MD_COMPRESS;
cmdline = 2;
}
- if (cmdline != 2)
- usage();
+ if (cmdline != 2)
+ usage();
if (realpath(optarg, mdio.md_file) == NULL) {
err(1, could not find full path for %s,
optarg);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221145 - in head: sbin/mount_nfs share/man/man5
Author: rmacklem Date: Thu Apr 28 00:20:35 2011 New Revision: 221145 URL: http://svn.freebsd.org/changeset/base/221145 Log: Update man pages related to the change in default NFS client applied by r221124. I also deleted references to idmapd, since that daemon no longer exists. This is a content change. Modified: head/sbin/mount_nfs/mount_nfs.8 head/share/man/man5/rc.conf.5 Modified: head/sbin/mount_nfs/mount_nfs.8 == --- head/sbin/mount_nfs/mount_nfs.8 Wed Apr 27 21:40:49 2011 (r221144) +++ head/sbin/mount_nfs/mount_nfs.8 Thu Apr 28 00:20:35 2011 (r221145) @@ -28,7 +28,7 @@ .\@(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\ $FreeBSD$ .\ -.Dd July 28, 2009 +.Dd April 27, 2011 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -63,6 +63,12 @@ It implements the mount protocol as desc .%T NFS: Network File System Version 3 Protocol Specification , Appendix I. .Pp +If the file system type is specified as ``oldnfs'', which implies this +command is run as ``mount_oldnfs'', then it forces use of the old NFS +client, which does not support the +.Cm nfsv4 +option. +.Pp By default, .Nm keeps retrying until the mount succeeds. @@ -163,10 +169,8 @@ Note that NFS version 2 has a file size Use the NFS Version 3 protocol. .It Cm nfsv4 Use the NFS Version 4 protocol. -This option will force the mount to use the experimental nfs subsystem and +This option will force the mount to use TCP transport. -To use the experimental nfs subsystem for nfsv2 and nfsv3 mounts, you -must specify the ``newnfs'' file system type instead of ``nfs''. .It Cm noconn For UDP mount points, do not do a .Xr connect 2 . Modified: head/share/man/man5/rc.conf.5 == --- head/share/man/man5/rc.conf.5 Wed Apr 27 21:40:49 2011 (r221144) +++ head/share/man/man5/rc.conf.5 Thu Apr 28 00:20:35 2011 (r221145) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd April 22, 2011 +.Dd April 27, 2011 .Dt RC.CONF 5 .Os .Sh NAME @@ -2024,20 +2024,63 @@ is set to these are the flags to pass to the .Xr nfsd 8 daemon. -.It Va idmapd_enable +.It Va nfsv4_server_enable .Pq Vt bool -If set to +If +.Va nfs_server_enable +is set to +.Dq Li YES +and +.Va nfsv4_server_enable +are set to +.Dq Li YES , +enable the server for NFSv4 as well as NFSv2 and NFSv3. +.It Va nfsuserd_enable +.Pq Vt bool +If +.Va nfsuserd_enable +is set to +.Dq Li YES , +run the nfsuserd daemon, which is needed for NFSv4 in order +to map between user/group names vs uid/gid numbers. +If +.Va nfsv4_server_enable +is set to .Dq Li YES , -run the ID mapping daemon for NFS version 4. -.It Va idmapd_flags +this will be forced enabled. +.It Va nfsuserd_flags .Pq Vt str If -.Va idmapd_enable +.Va nfsuserd_enable is set to .Dq Li YES , these are the flags to pass to the -.Xr idmapd 8 +.Xr nfsuserd 8 daemon. +.It Va nfscbd_enable +.Pq Vt bool +If +.Va nfscbd_enable +is set to +.Dq Li YES , +run the nfscbd daemon, which enables callbacks/delegations for the NFSv4 client. +.It Va nfscbd_flags +.Pq Vt str +If +.Va nfscbd_enable +is set to +.Dq Li YES , +these are the flags to pass to the +.Xr nfscbd 8 +daemon. +.It Va oldnfs_server_enable +.Pq Vt bool +If +.Va oldnfs_server_enable +is set to +.Dq Li YES , +force the NFS server daemons to run the old NFS server code +that does not support NFSv4. .It Va mountd_enable .Pq Vt bool If set to ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
