svn commit: r224540 - head/sys/dev/ath

2011-07-31 Thread Adrian Chadd
Author: adrian
Date: Sun Jul 31 05:59:33 2011
New Revision: 224540
URL: http://svn.freebsd.org/changeset/base/224540

Log:
  Fix typo!
  
  Approved by:  re (kib)

Modified:
  head/sys/dev/ath/if_athvar.h

Modified: head/sys/dev/ath/if_athvar.h
==
--- head/sys/dev/ath/if_athvar.hSun Jul 31 05:01:42 2011
(r224539)
+++ head/sys/dev/ath/if_athvar.hSun Jul 31 05:59:33 2011
(r224540)
@@ -651,7 +651,7 @@ voidath_intr(void *);
 #defineath_hal_gettxchainmask(_ah, _ptxchainmask) \
(ath_hal_getcapability(_ah, HAL_CAP_TX_CHAINMASK, 0, _ptxchainmask))
 #defineath_hal_split4ktrans(_ah) \
-   (ath_hal_getcapability(_ah, HAP_CAP_SPLIT_4KB_TRANS, 0, NULL) == HAL_OK)
+   (ath_hal_getcapability(_ah, HAL_CAP_SPLIT_4KB_TRANS, 0, NULL) == HAL_OK)
 #defineath_hal_self_linked_final_rxdesc(_ah) \
(ath_hal_getcapability(_ah, HAL_CAP_RXDESC_SELFLINK, 0, NULL) == HAL_OK)
 #defineath_hal_gtxto_supported(_ah) \
___
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: r224541 - head/sys/dev/ath

2011-07-31 Thread Adrian Chadd
Author: adrian
Date: Sun Jul 31 08:01:41 2011
New Revision: 224541
URL: http://svn.freebsd.org/changeset/base/224541

Log:
  Implement the 4KB split transaction workaround for Merlin (AR9280).
  
  The AR9280 apparently has an issue with descriptors which straddle a page
  boundary (4k). I'm not yet sure whether I should use PAGE_SIZE in the
  calculations or whether I should use 4096; the reference code uses 4096.
  
  This patch fiddles with descriptor allocation so a descriptor entry
  doesn't straddle a 4kb address boundary. The descriptor memory allocation
  is made larger to contain extra descriptors and then the descriptor
  address is advanced to the next 4kb boundary where needed.
  
  I've tested this both on Merlin (AR9280) and non-Merlin (in this case,
  AR9160.)
  
  Obtained from:Linux, Atheros
  Approved by:  re (kib)

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==
--- head/sys/dev/ath/if_ath.c   Sun Jul 31 05:59:33 2011(r224540)
+++ head/sys/dev/ath/if_ath.c   Sun Jul 31 08:01:41 2011(r224541)
@@ -2937,16 +2937,36 @@ ath_descdma_setup(struct ath_softc *sc,
 {
 #defineDS2PHYS(_dd, _ds) \
((_dd)-dd_desc_paddr + ((caddr_t)(_ds) - (caddr_t)(_dd)-dd_desc))
+#defineATH_DESC_4KB_BOUND_CHECK(_daddr, _len) \
+   u_int32_t)(_daddr)  0xFFF)  (0x1000 - (_len))) ? 1 : 0)
struct ifnet *ifp = sc-sc_ifp;
-   struct ath_desc *ds;
+   uint8_t *ds;
struct ath_buf *bf;
int i, bsize, error;
+   int desc_len;
+
+   desc_len = sizeof(struct ath_desc);
 
DPRINTF(sc, ATH_DEBUG_RESET, %s: %s DMA: %u buffers %u desc/buf\n,
__func__, name, nbuf, ndesc);
 
dd-dd_name = name;
-   dd-dd_desc_len = sizeof(struct ath_desc) * nbuf * ndesc;
+   dd-dd_desc_len = desc_len * nbuf * ndesc;
+
+   device_printf(sc-sc_dev, desc_len: %d, nbuf=%d, ndesc=%d; 
dd_desc_len=%d\n,
+   desc_len, nbuf, ndesc, dd-dd_desc_len);
+
+   /*
+* Merlin work-around:
+* Descriptors that cross the 4KB boundary can't be used.
+* Assume one skipped descriptor per 4KB page.
+*/
+   if (! ath_hal_split4ktrans(sc-sc_ah)) {
+   int numdescpage = 4096 / (desc_len * ndesc);
+   dd-dd_desc_len = (nbuf / numdescpage + 1) * 4096;
+   device_printf(sc-sc_dev, numdescpage: %d, new 
dd_desc_len=%d\n,
+   numdescpage, dd-dd_desc_len);
+   }
 
/*
 * Setup DMA descriptor area.
@@ -2995,7 +3015,7 @@ ath_descdma_setup(struct ath_softc *sc,
goto fail2;
}
 
-   ds = dd-dd_desc;
+   ds = (uint8_t *) dd-dd_desc;
DPRINTF(sc, ATH_DEBUG_RESET, %s: %s DMA map: %p (%lu) - %p (%lu)\n,
__func__, dd-dd_name, ds, (u_long) dd-dd_desc_len,
(caddr_t) dd-dd_desc_paddr, /*XXX*/ (u_long) dd-dd_desc_len);
@@ -3011,9 +3031,23 @@ ath_descdma_setup(struct ath_softc *sc,
dd-dd_bufptr = bf;
 
STAILQ_INIT(head);
-   for (i = 0; i  nbuf; i++, bf++, ds += ndesc) {
-   bf-bf_desc = ds;
+   for (i = 0; i  nbuf; i++, bf++, ds += (ndesc * desc_len)) {
+   bf-bf_desc = (struct ath_desc *) ds;
bf-bf_daddr = DS2PHYS(dd, ds);
+   if (! ath_hal_split4ktrans(sc-sc_ah)) {
+   /*
+* Merlin WAR: Skip descriptor addresses which
+* cause 4KB boundary crossing along any point
+* in the descriptor.
+*/
+if (ATH_DESC_4KB_BOUND_CHECK(bf-bf_daddr,
+desc_len * ndesc)) {
+   /* Start at the next page */
+   ds += 0x1000 - (bf-bf_daddr  0xFFF);
+   bf-bf_desc = (struct ath_desc *) ds;
+   bf-bf_daddr = DS2PHYS(dd, ds);
+   }
+   }
error = bus_dmamap_create(sc-sc_dmat, BUS_DMA_NOWAIT,
bf-bf_dmamap);
if (error != 0) {
@@ -3036,6 +3070,7 @@ fail0:
memset(dd, 0, sizeof(*dd));
return error;
 #undef DS2PHYS
+#undef ATH_DESC_4KB_BOUND_CHECK
 }
 
 static void
___
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: r224542 - head/sys/dev/ath

2011-07-31 Thread Adrian Chadd
Author: adrian
Date: Sun Jul 31 08:13:25 2011
New Revision: 224542
URL: http://svn.freebsd.org/changeset/base/224542

Log:
  Remove two debugging printf()s which snuck in during the testing of the
  last commit.
  
  Approved by:  re (kib)
  Pointy-hat-to:adrian@

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==
--- head/sys/dev/ath/if_ath.c   Sun Jul 31 08:01:41 2011(r224541)
+++ head/sys/dev/ath/if_ath.c   Sun Jul 31 08:13:25 2011(r224542)
@@ -2953,9 +2953,6 @@ ath_descdma_setup(struct ath_softc *sc,
dd-dd_name = name;
dd-dd_desc_len = desc_len * nbuf * ndesc;
 
-   device_printf(sc-sc_dev, desc_len: %d, nbuf=%d, ndesc=%d; 
dd_desc_len=%d\n,
-   desc_len, nbuf, ndesc, dd-dd_desc_len);
-
/*
 * Merlin work-around:
 * Descriptors that cross the 4KB boundary can't be used.
@@ -2964,8 +2961,6 @@ ath_descdma_setup(struct ath_softc *sc,
if (! ath_hal_split4ktrans(sc-sc_ah)) {
int numdescpage = 4096 / (desc_len * ndesc);
dd-dd_desc_len = (nbuf / numdescpage + 1) * 4096;
-   device_printf(sc-sc_dev, numdescpage: %d, new 
dd_desc_len=%d\n,
-   numdescpage, dd-dd_desc_len);
}
 
/*
___
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: r224546 - head/sys/kern

2011-07-31 Thread Gleb Smirnoff
Author: glebius
Date: Sun Jul 31 13:49:15 2011
New Revision: 224546
URL: http://svn.freebsd.org/changeset/base/224546

Log:
  Don't leak kld_sx lock in kldunloadf().
  
  Approved by:  re (kib)

Modified:
  head/sys/kern/kern_linker.c

Modified: head/sys/kern/kern_linker.c
==
--- head/sys/kern/kern_linker.c Sun Jul 31 13:35:25 2011(r224545)
+++ head/sys/kern/kern_linker.c Sun Jul 31 13:49:15 2011(r224546)
@@ -1116,8 +1116,9 @@ kern_kldunload(struct thread *td, int fi
PMC_CALL_HOOK(td, PMC_FN_KLD_UNLOAD, (void *) pkm);
KLD_UNLOCK_READ();
} else
-#else
KLD_UNLOCK();
+#else
+   KLD_UNLOCK();
 #endif
CURVNET_RESTORE();
return (error);
___
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: r224548 - head/share/man/man4

2011-07-31 Thread Glen Barber
Author: gjb (doc committer)
Date: Sun Jul 31 15:23:21 2011
New Revision: 224548
URL: http://svn.freebsd.org/changeset/base/224548

Log:
  mdoc(7) fix for the pcm(4) manual
  
  Spotted by:   manlint
  Approved by:  re (kib)

Modified:
  head/share/man/man4/pcm.4

Modified: head/share/man/man4/pcm.4
==
--- head/share/man/man4/pcm.4   Sun Jul 31 14:38:25 2011(r224547)
+++ head/share/man/man4/pcm.4   Sun Jul 31 15:23:21 2011(r224548)
@@ -45,7 +45,8 @@ kernel configuration file:
 The
 .Nm
 driver is the main component of the
-.Fx sound system.
+.Fx
+sound system.
 It works in conjunction with a bridge device driver on supported devices
 and provides PCM audio record and playback once it attaches.
 Each bridge device driver supports a specific set of audio chipsets and
___
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: r224550 - head/sys/dev/ath

2011-07-31 Thread Adrian Chadd
Author: adrian
Date: Sun Jul 31 16:16:25 2011
New Revision: 224550
URL: http://svn.freebsd.org/changeset/base/224550

Log:
  Disable the RXORN/RXEOL interrupts if RXEOL occurs, preventing an
  interrupt storm.
  
  This is easily triggered by flipping on and off tcpdump -y IEEE802_11_RADIO
  w/ witness enabled. This causes a whole lot of console IO and when you're
  attached to a serial console (eg on my AR7161 embedded board), the RX
  interrupt doesn't get called quickly enough and the RX queue fills up.
  
  This wasn't a problem in the past because of the self-linked RX descriptor
  trick - the RX would never hit the end of the RX descriptor list.
  However this isn't possible for 802.11n (see previous commit history for
  why.)
  
  Both Linux ath9k and the Atheros reference driver code do this; I'm just
  looking now for where they then restart the PCU receive. Right now the RX
  will just stop until the interface is reset.
  
  Obtained from:Linux, Atheros
  Approved by:  re (kib)

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==
--- head/sys/dev/ath/if_ath.c   Sun Jul 31 16:08:29 2011(r224549)
+++ head/sys/dev/ath/if_ath.c   Sun Jul 31 16:16:25 2011(r224550)
@@ -1395,6 +1395,12 @@ ath_intr(void *arg)
 * least on older hardware revs.
 */
sc-sc_stats.ast_rxeol++;
+   /*
+* Disable RXEOL/RXORN - prevent an interrupt
+* storm until the PCU logic can be reset.
+*/
+   sc-sc_imask = ~(HAL_INT_RXEOL | HAL_INT_RXORN);
+   ath_hal_intrset(ah, sc-sc_imask);
sc-sc_rxlink = NULL;
}
if (status  HAL_INT_TXURN) {
___
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: r224551 - head/sys/powerpc/booke

2011-07-31 Thread Marcel Moolenaar
Author: marcel
Date: Sun Jul 31 18:26:47 2011
New Revision: 224551
URL: http://svn.freebsd.org/changeset/base/224551

Log:
  Fix r224187: .word defines a 16-bit object and size_t is defined as
  a 32-bit intergal. Use .long to define sintrcnt and sintrname.
  
  Approved by:  re (blanket)

Modified:
  head/sys/powerpc/booke/locore.S

Modified: head/sys/powerpc/booke/locore.S
==
--- head/sys/powerpc/booke/locore.S Sun Jul 31 16:16:25 2011
(r224550)
+++ head/sys/powerpc/booke/locore.S Sun Jul 31 18:26:47 2011
(r224551)
@@ -790,12 +790,12 @@ GLOBAL(kernload)
 GLOBAL(intrnames)
.space  INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
 GLOBAL(sintrnames)
-   .word   INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
+   .long   INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
 
.align 4
 GLOBAL(intrcnt)
.space  INTRCNT_COUNT * 4 * 2
 GLOBAL(sintrcnt)
-   .word   INTRCNT_COUNT * 4 * 2
+   .long   INTRCNT_COUNT * 4 * 2
 
 #include powerpc/booke/trap_subr.S
___
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: r224551 - head/sys/powerpc/booke

2011-07-31 Thread Attilio Rao
I actually submitted a better fix which does use .int.
I wasn't sure BETA1 was out, so I'm going to send a formal request now.

Attilio

2011/7/31 Marcel Moolenaar mar...@freebsd.org:
 Author: marcel
 Date: Sun Jul 31 18:26:47 2011
 New Revision: 224551
 URL: http://svn.freebsd.org/changeset/base/224551

 Log:
  Fix r224187: .word defines a 16-bit object and size_t is defined as
  a 32-bit intergal. Use .long to define sintrcnt and sintrname.

  Approved by:  re (blanket)

 Modified:
  head/sys/powerpc/booke/locore.S

 Modified: head/sys/powerpc/booke/locore.S
 ==
 --- head/sys/powerpc/booke/locore.S     Sun Jul 31 16:16:25 2011        
 (r224550)
 +++ head/sys/powerpc/booke/locore.S     Sun Jul 31 18:26:47 2011        
 (r224551)
 @@ -790,12 +790,12 @@ GLOBAL(kernload)
  GLOBAL(intrnames)
        .space  INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
  GLOBAL(sintrnames)
 -       .word   INTRCNT_COUNT * (MAXCOMLEN + 1) * 2
 +       .long   INTRCNT_COUNT * (MAXCOMLEN + 1) * 2

        .align 4
  GLOBAL(intrcnt)
        .space  INTRCNT_COUNT * 4 * 2
  GLOBAL(sintrcnt)
 -       .word   INTRCNT_COUNT * 4 * 2
 +       .long   INTRCNT_COUNT * 4 * 2

  #include powerpc/booke/trap_subr.S




-- 
Peace can only be achieved by understanding - A. Einstein
___
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: r224552 - head/sys/powerpc/mpc85xx

2011-07-31 Thread Marcel Moolenaar
Author: marcel
Date: Sun Jul 31 18:30:38 2011
New Revision: 224552
URL: http://svn.freebsd.org/changeset/base/224552

Log:
  Fix r222813: we need to include sys/cpuset.h. because the PIC interface
  uses cpuset_t. While here, fix the redundant inclusion of sys/bus.h and
  order the includes.
  
  Approved by:  re (blanket)

Modified:
  head/sys/powerpc/mpc85xx/atpic.c

Modified: head/sys/powerpc/mpc85xx/atpic.c
==
--- head/sys/powerpc/mpc85xx/atpic.cSun Jul 31 18:26:47 2011
(r224551)
+++ head/sys/powerpc/mpc85xx/atpic.cSun Jul 31 18:30:38 2011
(r224552)
@@ -28,11 +28,11 @@ __FBSDID($FreeBSD$);
 
 #include sys/param.h
 #include sys/systm.h
+#include sys/bus.h
+#include sys/cpuset.h
 #include sys/kernel.h
 #include sys/module.h
-#include sys/bus.h
 #include sys/rman.h
-#include sys/bus.h
 
 #include machine/bus.h
 #include machine/intr_machdep.h
___
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: r224553 - head/sys/powerpc/conf

2011-07-31 Thread Marcel Moolenaar
Author: marcel
Date: Sun Jul 31 18:34:38 2011
New Revision: 224553
URL: http://svn.freebsd.org/changeset/base/224553

Log:
  Apply r221124 to Book-E: switch to the new NFS client.
  
  Approved by:  re (blanket)

Modified:
  head/sys/powerpc/conf/MPC85XX

Modified: head/sys/powerpc/conf/MPC85XX
==
--- head/sys/powerpc/conf/MPC85XX   Sun Jul 31 18:30:38 2011
(r224552)
+++ head/sys/powerpc/conf/MPC85XX   Sun Jul 31 18:34:38 2011
(r224553)
@@ -43,7 +43,7 @@ options   MD_ROOT
 optionsMPC85XX
 optionsMSDOSFS
 optionsNFS_ROOT
-optionsNFSCLIENT
+optionsNFSCL
 optionsNFSLOCKD
 optionsPROCFS
 optionsPSEUDOFS
___
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: r224551 - head/sys/powerpc/booke

2011-07-31 Thread Marcel Moolenaar

On Jul 31, 2011, at 11:27 AM, Attilio Rao wrote:

 I actually submitted a better fix which does use .int.
 I wasn't sure BETA1 was out, so I'm going to send a formal request now.

Maybe we should just let it be. I don't see anything
superior with using .int that .long didn't already
fix. If anything, we could end up breaking stuff and
then having to fix it again.

Any reason to go back in and change it again that I
can't see?

-- 
Marcel Moolenaar
mar...@xcllnt.net


___
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: r224551 - head/sys/powerpc/booke

2011-07-31 Thread Attilio Rao
2011/7/31 Marcel Moolenaar mar...@xcllnt.net:

 On Jul 31, 2011, at 11:27 AM, Attilio Rao wrote:

 I actually submitted a better fix which does use .int.
 I wasn't sure BETA1 was out, so I'm going to send a formal request now.

 Maybe we should just let it be. I don't see anything
 superior with using .int that .long didn't already
 fix. If anything, we could end up breaking stuff and
 then having to fix it again.

 Any reason to go back in and change it again that I
 can't see?

Besides extending the fix to arm and mips, size_t is typedefed as int
and not as long, thus I think it is more correct semantically.
Pratically speaking, for booke, it doesn't change anything though.

As you have the blanket on powerpc I'll do what you prefer for it, the
patch is here:
http://www.freebsd.org/~attilio/sintrcnt-fixup32.diff

Thanks,
Attilio


-- 
Peace can only be achieved by understanding - A. Einstein
___
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: r224554 - head/sys/fs/nfsserver

2011-07-31 Thread Rick Macklem
Author: rmacklem
Date: Sun Jul 31 20:06:11 2011
New Revision: 224554
URL: http://svn.freebsd.org/changeset/base/224554

Log:
  Fix rename in the new NFS server so that it does not require a
  recursive vnode lock on the directory for the case where the
  new file name is in the same directory as the old one. The patch
  handles this as a special case, recognized by the new directory
  having the same file handle as the old one and just VREF()s the old
  dir vnode for this case, instead of doing a second VFS_FHTOVP() to get it.
  This is required so that the server will work for file systems like
  msdosfs, that do not support recursive vnode locking.
  This problem was discovered during recent testing by pho@
  when exporting an msdosfs file system via the new NFS server.
  
  Tested by:pho
  Reviewed by:  zkirsch
  Approved by:  re (kib)
  MFC after:2 weeks

Modified:
  head/sys/fs/nfsserver/nfs_nfsdserv.c

Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c
==
--- head/sys/fs/nfsserver/nfs_nfsdserv.cSun Jul 31 18:34:38 2011
(r224553)
+++ head/sys/fs/nfsserver/nfs_nfsdserv.cSun Jul 31 20:06:11 2011
(r224554)
@@ -1425,6 +1425,7 @@ nfsrvd_rename(struct nfsrv_descript *nd,
struct nfsrvfh tfh;
char *bufp, *tbufp = NULL;
u_long *hashp;
+   fhandle_t fh;
 
if (nd-nd_repstat) {
nfsrv_wcc(nd, fdirfor_ret, fdirfor, fdiraft_ret, fdiraft);
@@ -1450,19 +1451,34 @@ nfsrvd_rename(struct nfsrv_descript *nd,
tnes = *toexp;
tdirfor_ret = nfsvno_getattr(tdp, tdirfor, nd-nd_cred, p, 0);
} else {
+   tfh.nfsrvfh_len = 0;
error = nfsrv_mtofh(nd, tfh);
+   if (error == 0)
+   error = nfsvno_getfh(dp, fh, p);
if (error) {
vput(dp);
/* todp is always NULL except NFSv4 */
nfsvno_relpathbuf(fromnd);
goto out;
}
-   nd-nd_cred-cr_uid = nd-nd_saveduid;
-   nfsd_fhtovp(nd, tfh, LK_EXCLUSIVE, tdp, tnes, NULL, 0, p);
-   if (tdp) {
+
+   /* If this is the same file handle, just VREF() the vnode. */
+   if (tfh.nfsrvfh_len == NFSX_MYFH 
+   !NFSBCMP(tfh.nfsrvfh_data, fh, NFSX_MYFH)) {
+   VREF(dp);
+   tdp = dp;
+   tnes = *exp;
tdirfor_ret = nfsvno_getattr(tdp, tdirfor, nd-nd_cred,
p, 1);
-   NFSVOPUNLOCK(tdp, 0);
+   } else {
+   nd-nd_cred-cr_uid = nd-nd_saveduid;
+   nfsd_fhtovp(nd, tfh, LK_EXCLUSIVE, tdp, tnes, NULL,
+   0, p);
+   if (tdp) {
+   tdirfor_ret = nfsvno_getattr(tdp, tdirfor,
+   nd-nd_cred, p, 1);
+   NFSVOPUNLOCK(tdp, 0);
+   }
}
}
NFSNAMEICNDSET(tond.ni_cnd, nd-nd_cred, RENAME, LOCKPARENT | LOCKLEAF 
| NOCACHE | SAVESTART);
___
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: r224555 - head/share/man/man9

2011-07-31 Thread Glen Barber
Author: gjb (doc committer)
Date: Sun Jul 31 21:04:47 2011
New Revision: 224555
URL: http://svn.freebsd.org/changeset/base/224555

Log:
  Update vfs_getopt(9) to reflect 32-bit to 64-bit change from
  r224290.
  
  PR:   159324
  Submitted by: Brandon Gooch (jamesbrandongooch % gmail ! com)
  Approved by:  re (kib)

Modified:
  head/share/man/man9/vfs_getopt.9

Modified: head/share/man/man9/vfs_getopt.9
==
--- head/share/man/man9/vfs_getopt.9Sun Jul 31 20:06:11 2011
(r224554)
+++ head/share/man/man9/vfs_getopt.9Sun Jul 31 21:04:47 2011
(r224555)
@@ -26,7 +26,7 @@
 .\
 .\ $FreeBSD$
 .\
-.Dd March 2, 2009
+.Dd July 31, 2011
 .Dt VFS_GETOPT 9
 .Os
 .Sh NAME
@@ -51,7 +51,7 @@
 .Fn vfs_getops struct vfsoptlist *opts const char *name int *error
 .Ft int
 .Fo vfs_flagopt
-.Fa struct vfsoptlist *opts const char *name u_int *flags u_int flag
+.Fa struct vfsoptlist *opts const char *name uint64_t *flags uint64_t 
flag
 .Fc
 .Ft int
 .Fo vfs_scanopt
___
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: r224284 - in head: share/man/man4 share/man/man5 share/man/man8 usr.sbin/faithd

2011-07-31 Thread Doug Barton
On 07/23/2011 15:55, Glen Barber wrote:
 +.%U http://www.ietf.org/rfc/rfc2893.txt

References to IETF documents in our documentation should use the
tools.ietf.org site. It gives a much nicer experience, including working
HTML tags, etc. For instance, the link for this page should be:

http://tools.ietf.org/html/rfc2893


-- 

Nothin' ever doesn't change, but nothin' changes much.
-- OK Go

Breadth of IT experience, and depth of knowledge in the DNS.
Yours for the right price.  :)  http://SupersetSolutions.com/

___
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: r224533 - head/share/man/man4

2011-07-31 Thread Hiroki Sato
Hi Joel,

Joel Dahl j...@freebsd.org wrote
  in 201107302309.p6un9rhj019...@svn.freebsd.org:

jo Author: joel (doc committer)
jo Date: Sat Jul 30 23:09:52 2011
jo New Revision: 224533
jo URL: http://svn.freebsd.org/changeset/base/224533
jo
jo Log:
jo   Add a better description, a few examples and a couple of minor fixes.
jo
jo   Reviewed by:  brueffer
jo   Approved by:  re (kib)
jo
jo Modified:
jo   head/share/man/man4/pcm.4
jo
jo Modified: head/share/man/man4/pcm.4
jo 
==

(snip)

jo @@ -173,7 +244,7 @@ controls (bass and treble).
jo  Commonly used for ear-candy or frequency compensation due to the vast
jo  difference in hardware quality.
jo  EQ is disabled by default, but can be enabled with the
jo -.Va hint.pcm. Ns Ao Ar X Ac Ns Va .eq
jo +.Va hint.pcm.%d.eq

 :

jo -.It Va hint.pcm. Ns Ao Ar X Ac Ns Va .eq
jo +.It Va hint.pcm.%d.eq

 :

jo -.It Va hint.pcm. Ns Ao Ar X Ac Ns Va .vpc
jo +.It Va hint.pcm.%d.vpc

 I know several manual pages are also using this expression (%d) for
 replaceables, but I am wondering if this is friendly for average
 users.  Is .Ar N for an integer problematic, for example?  I would
 like comments since other documents in DocBook have used such a
 notation for a long time and I feel we need consistency with them.

-- Hiroki


pgpHvfkTcpuoF.pgp
Description: PGP signature