svn commit: r208110 - head/usr.sbin/fifolog/lib
Author: phk
Date: Sat May 15 08:57:16 2010
New Revision: 208110
URL: http://svn.freebsd.org/changeset/base/208110
Log:
Do not attempt to render a logrecord with length byte, until we have
decompressed all the bytes required.
Modified:
head/usr.sbin/fifolog/lib/fifolog_reader.c
Modified: head/usr.sbin/fifolog/lib/fifolog_reader.c
==
--- head/usr.sbin/fifolog/lib/fifolog_reader.c Sat May 15 07:07:38 2010
(r208109)
+++ head/usr.sbin/fifolog/lib/fifolog_reader.c Sat May 15 08:57:16 2010
(r208110)
@@ -225,6 +225,8 @@ fifolog_reader_chop(struct fifolog_reade
if (u & FIFOLOG_LENGTH) {
v = p[w];
w++;
+ if (p + w + v >= q)
+ return (p);
} else {
for (v = 0; p + v + w < q && p[v + w] != '\0'; v++)
continue;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r208111 - head/sys/i386/i386
Author: phk
Date: Sat May 15 10:31:11 2010
New Revision: 208111
URL: http://svn.freebsd.org/changeset/base/208111
Log:
Apply a patch that has been lingering in my inbox for far too long:
On a soekris Net5501, if you do a watchdog -t 16, followed by a watchdog
-t 0 to disable the watchdog, and then after some time (16s) re-enable
the watchdog the box reboots immediatly. This prevents also to stop and
restart watchdogd(8).
This is because when you stop the watchdog, the timer is not stoped,
only the hard reset is disabled. So when the timer has elapsed, the C2
event of the timer is set.
But when the hard reset is re-enabled, the event is not cleared and the
box reboots.
The attached patch stops and resets the counter when the watchdog is
disabled and do not disable the hard reset of the timer (if the timer
has elapsed it's too late).
Submitted by: Patrick Lamaizière
Modified:
head/sys/i386/i386/geode.c
Modified: head/sys/i386/i386/geode.c
==
--- head/sys/i386/i386/geode.c Sat May 15 08:57:16 2010(r208110)
+++ head/sys/i386/i386/geode.c Sat May 15 10:31:11 2010(r208111)
@@ -208,14 +208,11 @@ geode_watchdog(void *foo __unused, u_int
static void
cs5536_watchdog(void *foo __unused, u_int cmd, int *error)
{
- u_int u, p;
+ u_int u, p, s;
uint16_t a;
uint32_t m;
a = rdmsr(0x514d);
- m = rdmsr(0x51400029);
- m &= ~(1 << 24);
- wrmsr(0x51400029, m);
u = cmd & WD_INTERVAL;
if (u >= 30 && u <= 44) {
@@ -228,12 +225,24 @@ cs5536_watchdog(void *foo __unused, u_in
/* reset counter */
outw(a + 4, 0);
/* Arm reset mechanism */
+ m = rdmsr(0x51400029);
m |= (1 << 24);
wrmsr(0x51400029, m);
/* Start counter */
outw(a + 6, 0x8000);
*error = 0;
+ } else {
+ /*
+* MFGPT_SETUP is write-once
+* Check if the counter has been setup
+*/
+ s = inw(a + 6);
+ if (s & (1 << 12)) {
+ /* Stop and reset counter */
+ outw(a + 6, 0);
+ outw(a + 4, 0);
+ }
}
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r208116 - head/etc
Author: jilles Date: Sat May 15 17:49:56 2010 New Revision: 208116 URL: http://svn.freebsd.org/changeset/base/208116 Log: Change the commented msgs examples in profile/csh.login from -f to -q. Starting something that wants input on login seems strange and can be dangerous. In some configurations, causing output can be bad, but it is not as dangerous. I do not expect this msgs invocation to be uncommented often. PR: conf/96015 MFC after:4 days Modified: head/etc/csh.login head/etc/profile Modified: head/etc/csh.login == --- head/etc/csh.login Sat May 15 17:02:33 2010(r208115) +++ head/etc/csh.login Sat May 15 17:49:56 2010(r208116) @@ -9,7 +9,7 @@ # login.conf(5) and in particular the charset and lang options. # For full locales list check /usr/share/locale/* # -# Read system messages -# msgs -f +# Check system messages +# msgs -q # Allow terminal messages # mesg y Modified: head/etc/profile == --- head/etc/profileSat May 15 17:02:33 2010(r208115) +++ head/etc/profileSat May 15 17:49:56 2010(r208116) @@ -12,7 +12,7 @@ # You should also read the setlocale(3) man page for information # on how to achieve more precise control of locale settings. # -# Read system messages -# msgs -f +# Check system messages +# msgs -q # Allow terminal messages # mesg y ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r208117 - head/sys/dev/e1000
Author: marius Date: Sat May 15 19:46:16 2010 New Revision: 208117 URL: http://svn.freebsd.org/changeset/base/208117 Log: Fix a mismerge in r206001. PR: 146614 Approved by: jfv (implicit) MFC afer: 3 days Modified: head/sys/dev/e1000/if_em.c Modified: head/sys/dev/e1000/if_em.c == --- head/sys/dev/e1000/if_em.c Sat May 15 17:49:56 2010(r208116) +++ head/sys/dev/e1000/if_em.c Sat May 15 19:46:16 2010(r208117) @@ -710,6 +710,9 @@ em_detach(device_t dev) ether_poll_deregister(ifp); #endif + if (adapter->led_dev != NULL) + led_destroy(adapter->led_dev); + EM_CORE_LOCK(adapter); adapter->in_detach = 1; em_stop(adapter); @@ -779,9 +782,6 @@ em_resume(device_t dev) struct adapter *adapter = device_get_softc(dev); struct ifnet *ifp = adapter->ifp; - if (adapter->led_dev != NULL) - led_destroy(adapter->led_dev); - EM_CORE_LOCK(adapter); em_init_locked(adapter); em_init_manageability(adapter); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r208119 - head/sys/dev/isp
Author: mjacob
Date: Sat May 15 20:26:10 2010
New Revision: 208119
URL: http://svn.freebsd.org/changeset/base/208119
Log:
Whap. Hook up some wires that were forgotten a few months ago and restore
the zombie device timeout code and the loop down time code and the fabric
hysteresis code.
MFC after:1 week
Sponsored By: Panasas
Modified:
head/sys/dev/isp/isp_freebsd.c
head/sys/dev/isp/ispvar.h
Modified: head/sys/dev/isp/isp_freebsd.c
==
--- head/sys/dev/isp/isp_freebsd.c Sat May 15 20:25:29 2010
(r208118)
+++ head/sys/dev/isp/isp_freebsd.c Sat May 15 20:26:10 2010
(r208119)
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
MODULE_VERSION(isp, 1);
MODULE_DEPEND(isp, cam, 1, 1, 1);
int isp_announced = 0;
-int isp_fabric_hysteresis = 3;
+int isp_fabric_hysteresis = 5;
int isp_loop_down_limit = 60; /* default loop down limit */
int isp_change_is_bad = 0; /* "changed" devices are bad */
int isp_quickboot_time = 7;/* don't wait more than N secs for loop up */
@@ -141,9 +141,12 @@ isp_attach_chan(ispsoftc_t *isp, struct
fc->path = path;
fc->isp = isp;
fc->ready = 1;
-
+ fc->gone_device_time = isp_gone_device_time;
+ fc->loop_down_limit = isp_loop_down_limit;
+ fc->hysteresis = isp_fabric_hysteresis;
callout_init_mtx(&fc->ldt, &isp->isp_osinfo.lock, 0);
callout_init_mtx(&fc->gdt, &isp->isp_osinfo.lock, 0);
+
/*
* We start by being "loop down" if we have an initiator role
*/
@@ -3940,7 +3943,7 @@ isp_gdt(void *arg)
fcportdb_t *lp;
int dbidx, tgt, more_to_do = 0;
- isp_prt(isp, ISP_LOGDEBUG0, "Chan %d GDT timer expired", chan);
+ isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan %d GDT timer expired @
%lu", chan, time_uptime);
for (dbidx = 0; dbidx < MAX_FC_TARG; dbidx++) {
lp = &FCPARAM(isp, chan)->portdb[dbidx];
@@ -3950,15 +3953,8 @@ isp_gdt(void *arg)
if (lp->dev_map_idx == 0 || lp->target_mode) {
continue;
}
- /*
-* We can use new_portid here because it is untouched
-* while the state is ZOMBIE
-*/
- if (lp->new_portid == 0) {
- continue;
- }
- lp->new_portid -= 1;
- if (lp->new_portid != 0) {
+ if (lp->gone_timer != 0) {
+ lp->gone_timer -= 1;
more_to_do++;
continue;
}
@@ -3973,7 +3969,7 @@ isp_gdt(void *arg)
if (more_to_do) {
callout_reset(&fc->gdt, hz, isp_gdt, fc);
} else {
- isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan %d
stopping Gone Device Timer", chan);
+ isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan %d
Stopping Gone Device Timer", chan);
}
}
}
@@ -4942,7 +4938,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
}
if (!callout_active(&fc->ldt)) {
callout_reset(&fc->ldt,
fc->loop_down_limit * hz, isp_ldt, fc);
- isp_prt(isp,
ISP_LOGSANCFG|ISP_LOGDEBUG0, "starting Loop Down Timer @ %lu", (unsigned long)
time_uptime);
+ isp_prt(isp,
ISP_LOGSANCFG|ISP_LOGDEBUG0, "Starting Loop Down Timer @ %lu", (unsigned long)
time_uptime);
}
}
}
@@ -4972,6 +4968,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
va_end(ap);
fc = ISP_FC_PC(isp, bus);
lp->reserved = 0;
+ lp->gone_timer = 0;
if ((FCPARAM(isp, bus)->role & ISP_ROLE_INITIATOR) &&
(lp->roles & (SVC3_TGT_ROLE >> SVC3_ROLE_SHIFT))) {
int dbidx = lp - FCPARAM(isp, bus)->portdb;
int i;
@@ -5007,6 +5004,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
va_end(ap);
fc = ISP_FC_PC(isp, bus);
lp->reserved = 0;
+ lp->gone_timer = 0;
if (isp_change_is_bad) {
lp->state = FC_PORTDB_STATE_NIL;
if (lp->dev_map_idx) {
@@ -5061,15 +5059,13 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
* If it isn't marked that isp_gdt is going to get rid of it,
* announce that it's gone.
*
-* We can use new_portid for the gone timer because it's
-* undefined while the state is ZOMBIE.
*/
if (lp->dev_map_idx && lp->reserved == 0)
svn commit: r208120 - head/sys/dev/bwn
Author: weongyo
Date: Sat May 15 21:18:15 2010
New Revision: 208120
URL: http://svn.freebsd.org/changeset/base/208120
Log:
- fixes a bug that it didn't initialize the ratectl after association;
so ni_txrate returned 0 which is a invalid result.
- The fourth argument of ieee80211_ratectl_tx_complete() could be not
NULL.
Reported by: Gustau P?rez
Tested by:Gustau P?rez ,
Ian FREISLICH
MFC after:3 days
Modified:
head/sys/dev/bwn/if_bwn.c
Modified: head/sys/dev/bwn/if_bwn.c
==
--- head/sys/dev/bwn/if_bwn.c Sat May 15 20:26:10 2010(r208119)
+++ head/sys/dev/bwn/if_bwn.c Sat May 15 21:18:15 2010(r208120)
@@ -8329,6 +8329,7 @@ bwn_phy_reset(struct bwn_mac *mac)
static int
bwn_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
{
+ const struct ieee80211_txparam *tp;
struct bwn_vap *bvp = BWN_VAP(vap);
struct ieee80211com *ic= vap->iv_ic;
struct ifnet *ifp = ic->ic_ifp;
@@ -8377,6 +8378,11 @@ bwn_newstate(struct ieee80211vap *vap, e
bwn_set_pretbtt(mac);
bwn_spu_setdelay(mac, 0);
bwn_set_macaddr(mac);
+
+ /* Initializes ratectl for a node. */
+ tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)];
+ if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE)
+ ieee80211_ratectl_node_init(vap->iv_bss);
}
BWN_UNLOCK(sc);
@@ -8994,7 +9000,7 @@ bwn_handle_txeof(struct bwn_mac *mac, co
struct bwn_stats *stats = &mac->mac_stats;
struct ieee80211_node *ni;
struct ieee80211vap *vap;
- int slot;
+ int retrycnt = 0, slot;
BWN_ASSERT_LOCKED(mac->mac_sc);
@@ -9027,7 +9033,7 @@ bwn_handle_txeof(struct bwn_mac *mac, co
status->ack ?
IEEE80211_RATECTL_TX_SUCCESS :
IEEE80211_RATECTL_TX_FAILURE,
- NULL, 0);
+ &retrycnt, 0);
break;
}
slot = bwn_dma_nextslot(dr, slot);
@@ -9048,7 +9054,7 @@ bwn_handle_txeof(struct bwn_mac *mac, co
status->ack ?
IEEE80211_RATECTL_TX_SUCCESS :
IEEE80211_RATECTL_TX_FAILURE,
- NULL, 0);
+ &retrycnt, 0);
}
bwn_pio_handle_txeof(mac, status);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r208120 - head/sys/dev/bwn
On 15 May 2010, at 17:18, Weongyo Jeong wrote:
> Author: weongyo
> Date: Sat May 15 21:18:15 2010
> New Revision: 208120
> URL: http://svn.freebsd.org/changeset/base/208120
>
> Log:
> - fixes a bug that it didn't initialize the ratectl after association;
>so ni_txrate returned 0 which is a invalid result.
> - The fourth argument of ieee80211_ratectl_tx_complete() could be not
>NULL.
>
Thanks!
> Reported by: Gustau P?rez
> Tested by: Gustau P?rez ,
> Ian FREISLICH
> MFC after: 3 days
>
> Modified:
> head/sys/dev/bwn/if_bwn.c
>
> Modified: head/sys/dev/bwn/if_bwn.c
> ==
> --- head/sys/dev/bwn/if_bwn.c Sat May 15 20:26:10 2010(r208119)
> +++ head/sys/dev/bwn/if_bwn.c Sat May 15 21:18:15 2010(r208120)
> @@ -8329,6 +8329,7 @@ bwn_phy_reset(struct bwn_mac *mac)
> static int
> bwn_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
> {
> + const struct ieee80211_txparam *tp;
> struct bwn_vap *bvp = BWN_VAP(vap);
> struct ieee80211com *ic= vap->iv_ic;
> struct ifnet *ifp = ic->ic_ifp;
> @@ -8377,6 +8378,11 @@ bwn_newstate(struct ieee80211vap *vap, e
> bwn_set_pretbtt(mac);
> bwn_spu_setdelay(mac, 0);
> bwn_set_macaddr(mac);
> +
> + /* Initializes ratectl for a node. */
> + tp = &vap->iv_txparms[ieee80211_chan2mode(ic->ic_curchan)];
> + if (tp->ucastrate == IEEE80211_FIXED_RATE_NONE)
> + ieee80211_ratectl_node_init(vap->iv_bss);
> }
>
> BWN_UNLOCK(sc);
> @@ -8994,7 +9000,7 @@ bwn_handle_txeof(struct bwn_mac *mac, co
> struct bwn_stats *stats = &mac->mac_stats;
> struct ieee80211_node *ni;
> struct ieee80211vap *vap;
> - int slot;
> + int retrycnt = 0, slot;
>
> BWN_ASSERT_LOCKED(mac->mac_sc);
>
> @@ -9027,7 +9033,7 @@ bwn_handle_txeof(struct bwn_mac *mac, co
> status->ack ?
> IEEE80211_RATECTL_TX_SUCCESS :
> IEEE80211_RATECTL_TX_FAILURE,
> - NULL, 0);
> + &retrycnt, 0);
> break;
> }
> slot = bwn_dma_nextslot(dr, slot);
> @@ -9048,7 +9054,7 @@ bwn_handle_txeof(struct bwn_mac *mac, co
> status->ack ?
> IEEE80211_RATECTL_TX_SUCCESS :
> IEEE80211_RATECTL_TX_FAILURE,
> - NULL, 0);
> + &retrycnt, 0);
> }
> bwn_pio_handle_txeof(mac, status);
> }
>
>
> Use the link below to report this message as spam.
> https://lavabit.com/apps/teacher?sig=1097658&key=888213324
>
--
Rui Paulo
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r208119 - head/sys/dev/isp
On Sat, May 15, 2010 at 1:26 PM, Matt Jacob wrote: > Author: mjacob > Date: Sat May 15 20:26:10 2010 > New Revision: 208119 > URL: http://svn.freebsd.org/changeset/base/208119 > > Log: > Whap. Hook up some wires that were forgotten a few months ago and restore > the zombie device timeout code and the loop down time code and the fabric > hysteresis code. > MFC after: 1 week > Sponsored By: Panasas > > Modified: > head/sys/dev/isp/isp_freebsd.c > head/sys/dev/isp/ispvar.h > Hi, I haven't seen anything from the tinderbox but I am getting a build failure after this change. This is i386 in vmware: ===> isp (all) cc -O2 -fno-strict-aliasing -pipe -fomit-frame-pointer -march=prescott -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/CORETWO/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -I/usr/obj/usr/src/sys/CORETWO -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -c /usr/src/sys/modules/isp/../../dev/isp/isp.c cc -O2 -fno-strict-aliasing -pipe -fomit-frame-pointer -march=prescott -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/CORETWO/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -I/usr/obj/usr/src/sys/CORETWO -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -c /usr/src/sys/modules/isp/../../dev/isp/isp_library.c cc -O2 -fno-strict-aliasing -pipe -fomit-frame-pointer -march=prescott -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/CORETWO/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -I/usr/obj/usr/src/sys/CORETWO -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -c /usr/src/sys/modules/isp/../../dev/isp/isp_target.c cc -O2 -fno-strict-aliasing -pipe -fomit-frame-pointer -march=prescott -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/CORETWO/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -I/usr/obj/usr/src/sys/CORETWO -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -c /usr/src/sys/modules/isp/../../dev/isp/isp_freebsd.c cc1: warnings being treated as errors /usr/src/sys/modules/isp/../../dev/isp/isp_freebsd.c: In function 'isp_gdt': /usr/src/sys/modules/isp/../../dev/isp/isp_freebsd.c:3946: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'time_t' /usr/src/sys/modules/isp/../../dev/isp/isp_freebsd.c: In function 'isp_async': /usr/src/sys/modules/isp/../../dev/isp/isp_freebsd.c:5068: warning: format '%lu' expects type 'long unsigned int', but argument 6 has type 'time_t' *** Error code 1 Stop in /usr/src/sys/modules/isp. *** Error code 1 Stop in /usr/src/sys/modules. *** Error code 1 Stop in /usr/obj/usr/src/sys/CORETWO. *** Error code 1 Stop in /usr/src. *** Error code 1 Stop in /usr/src. -- Rob Farmer ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r208128 - head/sys/fs/nullfs
Author: kib
Date: Sun May 16 05:00:29 2010
New Revision: 208128
URL: http://svn.freebsd.org/changeset/base/208128
Log:
Disable bypass for the vop_advlockpurge(). The vop is called after
vop_revoke(), the v_data is already destroyed.
Reported and tested by: ed
Modified:
head/sys/fs/nullfs/null_vnops.c
Modified: head/sys/fs/nullfs/null_vnops.c
==
--- head/sys/fs/nullfs/null_vnops.c Sun May 16 04:31:16 2010
(r208127)
+++ head/sys/fs/nullfs/null_vnops.c Sun May 16 05:00:29 2010
(r208128)
@@ -798,6 +798,7 @@ struct vop_vector null_vnodeops = {
.vop_bypass = null_bypass,
.vop_access = null_access,
.vop_accessx = null_accessx,
+ .vop_advlockpurge = vop_stdadvlockpurge,
.vop_bmap = VOP_EOPNOTSUPP,
.vop_getattr = null_getattr,
.vop_getwritemount =null_getwritemount,
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r208128 - head/sys/fs/nullfs
On Sun, May 16, 2010 at 05:00:29AM +, Konstantin Belousov wrote: > Author: kib > Date: Sun May 16 05:00:29 2010 > New Revision: 208128 > URL: http://svn.freebsd.org/changeset/base/208128 > > Log: > Disable bypass for the vop_advlockpurge(). The vop is called after > vop_revoke(), the v_data is already destroyed. > > Reported and tested by: ed Reported and tested by: emaste Ed Maste, not Ed Schouten. Sorry. pgpMZlVQoCf6e.pgp Description: PGP signature
Re: svn commit: r208003 - in head/sys: kern sys
On Wed, May 12, 2010 at 09:24:46PM +, Zachary Loafman wrote: > Author: zml > Date: Wed May 12 21:24:46 2010 > New Revision: 208003 > URL: http://svn.freebsd.org/changeset/base/208003 > > Log: > Add VOP_ADVLOCKPURGE so that the file system is called when purging > locks (in the case where the VFS impl isn't using lf_*) > > Submitted by: Matthew Fleming > Reviewed by:zml, dfr After looking at what happen to nullfs, see r208003, I wonder why the vop is needed. It is called after VOP_RECLAIM is called by vgonel(), after fs-specific data are destroyed. So, on the one hand, vop can only operate on struct vnode proper, on the other hand, the actions performed by vop_advlockpurge implementation can be done by vop_reclaim as well. Could you, please, give some details on the supposed use of the vop ? pgpmxeEfX8FyB.pgp Description: PGP signature
Re: svn commit: r208119 - head/sys/dev/isp
On 5/15/2010 8:17 PM, Rob Farmer wrote: On Sat, May 15, 2010 at 1:26 PM, Matt Jacob wrote: Author: mjacob Date: Sat May 15 20:26:10 2010 New Revision: 208119 URL: http://svn.freebsd.org/changeset/base/208119 Log: Whap. Hook up some wires that were forgotten a few months ago and restore the zombie device timeout code and the loop down time code and the fabric hysteresis code. MFC after:1 week Sponsored By: Panasas Modified: head/sys/dev/isp/isp_freebsd.c head/sys/dev/isp/ispvar.h Hi, I haven't seen anything from the tinderbox but I am getting a build failure after this change. This is i386 in vmware: ===> isp (all) cc -O2 -fno-strict-aliasing -pipe -fomit-frame-pointer -march=prescott -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/CORETWO/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -I/usr/obj/usr/src/sys/CORETWO -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -c /usr/src/sys/modules/isp/../../dev/isp/isp.c cc -O2 -fno-strict-aliasing -pipe -fomit-frame-pointer -march=prescott -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/CORETWO/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -I/usr/obj/usr/src/sys/CORETWO -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -c /usr/src/sys/modules/isp/../../dev/isp/isp_library.c cc -O2 -fno-strict-aliasing -pipe -fomit-frame-pointer -march=prescott -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/CORETWO/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -I/usr/obj/usr/src/sys/CORETWO -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -c /usr/src/sys/modules/isp/../../dev/isp/isp_target.c cc -O2 -fno-strict-aliasing -pipe -fomit-frame-pointer -march=prescott -Werror -D_KERNEL -DKLD_MODULE -nostdinc -DHAVE_KERNEL_OPTION_HEADERS -include /usr/obj/usr/src/sys/CORETWO/opt_global.h -I. -I@ -I@/contrib/altq -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -fno-common -I/usr/obj/usr/src/sys/CORETWO -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -std=iso9899:1999 -fstack-protector -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -c /usr/src/sys/modules/isp/../../dev/isp/isp_freebsd.c cc1: warnings being treated as errors /usr/src/sys/modules/isp/../../dev/isp/isp_freebsd.c: In function 'isp_gdt': /usr/src/sys/modules/isp/../../dev/isp/isp_freebsd.c:3946: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'time_t' /usr/src/sys/modules/isp/../../dev/isp/isp_freebsd.c: In function 'isp_async': /usr/src/sys/modules/isp/../../dev/isp/isp_freebsd.c:5068: warning: format '%lu' expects type 'long unsigned int', but argument 6 has type 'time_t' *** Error code 1 Grumble. Thanks. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r208129 - head/sys/dev/isp
Author: mjacob
Date: Sun May 16 06:40:05 2010
New Revision: 208129
URL: http://svn.freebsd.org/changeset/base/208129
Log:
Correct compilation error introduced in last commit.
X-MFC:208119
MFC after: 1 week
Sponsored By: Panasas
Pointy Hat to:Me
Noticed by: Rob
Modified:
head/sys/dev/isp/isp_freebsd.c
Modified: head/sys/dev/isp/isp_freebsd.c
==
--- head/sys/dev/isp/isp_freebsd.c Sun May 16 05:00:29 2010
(r208128)
+++ head/sys/dev/isp/isp_freebsd.c Sun May 16 06:40:05 2010
(r208129)
@@ -3943,7 +3943,7 @@ isp_gdt(void *arg)
fcportdb_t *lp;
int dbidx, tgt, more_to_do = 0;
- isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan %d GDT timer expired @
%lu", chan, time_uptime);
+ isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan %d GDT timer expired @
%lu", chan, (unsigned long) time_uptime);
for (dbidx = 0; dbidx < MAX_FC_TARG; dbidx++) {
lp = &FCPARAM(isp, chan)->portdb[dbidx];
@@ -5065,7 +5065,7 @@ isp_async(ispsoftc_t *isp, ispasync_t cm
lp->state = FC_PORTDB_STATE_ZOMBIE;
lp->gone_timer = ISP_FC_PC(isp, bus)->gone_device_time;
if (fc->ready && !callout_active(&fc->gdt)) {
- isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan
%d Starting Gone Device Timer with %u seconds time now %lu", bus,
lp->gone_timer, time_uptime);
+ isp_prt(isp, ISP_LOGSANCFG|ISP_LOGDEBUG0, "Chan
%d Starting Gone Device Timer with %u seconds time now %lu", bus,
lp->gone_timer, (unsigned long)time_uptime);
callout_reset(&fc->gdt, hz, isp_gdt, fc);
}
tgt = lp->dev_map_idx - 1;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
