]> git.hungrycats.org Git - linux/log
linux
22 years agoMerge cantab.net:/home/src/ntfs-2.6
Anton Altaparmakov [Thu, 30 Sep 2004 00:05:42 +0000 (01:05 +0100)]
Merge cantab.net:/home/src/ntfs-2.6
into cantab.net:/home/src/ntfs-2.6-devel

22 years agoNTFS: Implement extent mft record deallocation.
Anton Altaparmakov [Wed, 29 Sep 2004 15:34:02 +0000 (16:34 +0100)]
NTFS: Implement extent mft record deallocation.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
22 years agoFix up tty locking update for sgttyb emulation (TIOCGETP and TIOCSETP).
Linus Torvalds [Wed, 29 Sep 2004 07:27:27 +0000 (00:27 -0700)]
Fix up tty locking update for sgttyb emulation (TIOCGETP and TIOCSETP).

22 years ago[PATCH] ppc64: Fix !SMP build
Benjamin Herrenschmidt [Wed, 29 Sep 2004 07:09:33 +0000 (00:09 -0700)]
[PATCH] ppc64: Fix !SMP build

People don't build UP very often it seems ... anyways, it was broken,
here is the fix.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years ago[PATCH] ppc64: DART iommu allocation fix
Benjamin Herrenschmidt [Wed, 29 Sep 2004 07:09:21 +0000 (00:09 -0700)]
[PATCH] ppc64: DART iommu allocation fix

The current code allocating the DART has a couple of bugs, first
it's called on all machines including the ones who have no DART
(oops), and then it tries to access the device-tree using the
"of_chosen" pointer before it was initialized.

The enclosed patch fixes these.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years ago[PATCH] ppc/ppc64: Fix g5 access to PCI IO cycles
Benjamin Herrenschmidt [Wed, 29 Sep 2004 07:09:09 +0000 (00:09 -0700)]
[PATCH] ppc/ppc64: Fix g5 access to PCI IO cycles

Looks like we never needed them, since that bug has been there forever,
I didn't get the right base for the IO cycles on the G5 host bridge
in the first place (I probably misinterpreted some OF forth code or
something like that).

22 years ago[PATCH] tty locking cleanup and fixes
Alan Cox [Wed, 29 Sep 2004 07:05:39 +0000 (00:05 -0700)]
[PATCH] tty locking cleanup and fixes

No problems reported other than Linus typo in an unbuildable driver from
the last one.

This one adds tty_ldisc_flush and also makes tty_wakeup do the queue
wake as discussed with Paul.  I've then propagated these functions
through all the drivers.  This means most drivers don't know about the
ldisc locking and instead call generic functions that look after it.
The result is the removal of a lot of duplicate code both for ldisc
referencing and historical code for handling tty ldisc wakeup semantics.

A nice side effect is that by adding versions of the two helpers we can
switch most of the drivers over before changing the core tty code if
preferred.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years ago[PATCH] Fix sparse warning in bio.c
Jens Axboe [Wed, 29 Sep 2004 06:32:26 +0000 (23:32 -0700)]
[PATCH] Fix sparse warning in bio.c

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years ago[PATCH] thinko in kmalloc check in partial completion fix
Jens Axboe [Wed, 29 Sep 2004 06:32:14 +0000 (23:32 -0700)]
[PATCH] thinko in kmalloc check in partial completion fix

Silly thinko/typo, it needs to check the newly allocated memory for
failure of course. Noticed by Stefan Meyknecht.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years agoMerge bk://kernel.bkbits.net/davem/sparc-2.6
Linus Torvalds [Wed, 29 Sep 2004 06:05:52 +0000 (23:05 -0700)]
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

22 years agoMerge bk://kernel.bkbits.net/davem/net-2.6
Linus Torvalds [Wed, 29 Sep 2004 06:04:50 +0000 (23:04 -0700)]
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

22 years agoMerge bk://linux-ntfs.bkbits.net/ntfs-2.6
Linus Torvalds [Wed, 29 Sep 2004 05:58:39 +0000 (22:58 -0700)]
Merge bk://linux-ntfs.bkbits.net/ntfs-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

22 years agoMerge ssh://linux-ntfs@bkbits.net/ntfs-2.6
Richard Russon [Wed, 29 Sep 2004 00:27:02 +0000 (01:27 +0100)]
Merge ssh://linux-ntfs@bkbits.net/ntfs-2.6
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

22 years agoMerge cantab.net:/home/src/bklinux-2.6
Anton Altaparmakov [Tue, 28 Sep 2004 22:26:55 +0000 (23:26 +0100)]
Merge cantab.net:/home/src/bklinux-2.6
into cantab.net:/home/src/ntfs-2.6

22 years agoMerge flatcap.org:/home/flatcap/backup/bk/linux-2.6
Richard Russon [Tue, 28 Sep 2004 18:30:38 +0000 (19:30 +0100)]
Merge flatcap.org:/home/flatcap/backup/bk/linux-2.6
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

22 years ago[NETFILTER]: move check for already tracked/untracked before fragment check
Patrick McHardy [Tue, 28 Sep 2004 13:34:58 +0000 (06:34 -0700)]
[NETFILTER]: move check for already tracked/untracked before fragment check

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[SPARC64]: Disable SBH interrupt properly.
David S. Miller [Tue, 28 Sep 2004 13:21:07 +0000 (06:21 -0700)]
[SPARC64]: Disable SBH interrupt properly.

Signed-off-by: David S. Miller <davem@davemloft.net>
22 years agoMerge ssh://linux-ntfs@bkbits.net/ntfs-2.6-devel
Richard Russon [Tue, 28 Sep 2004 13:00:04 +0000 (14:00 +0100)]
Merge ssh://linux-ntfs@bkbits.net/ntfs-2.6-devel
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel

22 years agoMerge ssh://linux-ntfs@bkbits.net/ntfs-2.6
Richard Russon [Tue, 28 Sep 2004 12:57:23 +0000 (13:57 +0100)]
Merge ssh://linux-ntfs@bkbits.net/ntfs-2.6
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

22 years agoNTFS: Change all the defines back to simple enums since sparse is now happy
Anton Altaparmakov [Tue, 28 Sep 2004 11:29:51 +0000 (12:29 +0100)]
NTFS: Change all the defines back to simple enums since sparse is now happy
      typed enums.  This completes the sparse annotations in NTFS.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
22 years ago[SPARC64]: Do not log streaming byte hole errors.
David S. Miller [Tue, 28 Sep 2004 08:09:06 +0000 (01:09 -0700)]
[SPARC64]: Do not log streaming byte hole errors.

They are just a nuissance.

Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[SPARC64]: Make bbc_i2c use msleep_interruptible().
Nishanth Aravamudan [Tue, 28 Sep 2004 08:04:45 +0000 (01:04 -0700)]
[SPARC64]: Make bbc_i2c use msleep_interruptible().

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[SPARC64]: Make bbc_envctrl use msleep_interruptible().
Nishanth Aravamudan [Tue, 28 Sep 2004 08:03:58 +0000 (01:03 -0700)]
[SPARC64]: Make bbc_envctrl use msleep_interruptible().

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[NETLINK]: In netlink_trim(), verify that SKB is not on a list.
David S. Miller [Tue, 28 Sep 2004 07:47:53 +0000 (00:47 -0700)]
[NETLINK]: In netlink_trim(), verify that SKB is not on a list.

Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[NETLINK]: Trim SKBs at netlink_{unicast,broadcast}() time.
Herbert Xu [Tue, 28 Sep 2004 07:44:58 +0000 (00:44 -0700)]
[NETLINK]: Trim SKBs at netlink_{unicast,broadcast}() time.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[NET]: Generic network statistics
Harald Welte [Tue, 28 Sep 2004 07:22:31 +0000 (00:22 -0700)]
[NET]: Generic network statistics

This patch moves the following files in /proc:
/proc/net/rt_cache_stat  /proc/net/stat/rt_cache
/proc/net/ip_conntrack_stat /proc/net/stat/ip_conntrack
/proc/net/arp_cache_stat /proc/net/stat/arp_cache
/proc/net/clip_arp_cache_stat /proc/net/stat/clip_arp_cache
/proc/net/dn_neigh_cache_stat /proc/net/stat/dn_neigh_cache

This allows a generic statistics tool to scan for all available statistics
by doing readdir(2) on /proc/net/stat

It also adds a special first 'template' line to rt_cache and ip_conntrack
in order to facilitate compatibility once somebody adds new fields to the
output lines.

WARNING:
This breaks existing rtstat.c and ctstat.c userspace programs
(hopefully for the last time).  rtstat is non-existant or broken in
major distributions anyway, and ctstat is too new for any distros
having it picked up.  Therefore, we justify this breakage.

A new unified statistics tool for routing cache, connection tracking and
neighbour cache is under development and will be included with iproute2.

Signed-off-by: Harald Welte <laforge@gnumonks.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years agoMerge bk://bk.skbuff.net:20609/linux-2.6-inet6-20040928/
David S. Miller [Tue, 28 Sep 2004 07:15:45 +0000 (00:15 -0700)]
Merge bk://bk.skbuff.net:20609/linux-2.6-inet6-20040928/
into nuts.davemloft.net:/disk1/BK/net-2.6

22 years ago[IPV6] Fix skb allocation size for RST and ACK.
Hideaki Yoshifuji [Tue, 28 Sep 2004 22:55:20 +0000 (07:55 +0900)]
[IPV6] Fix skb allocation size for RST and ACK.

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
22 years ago[IPV6] Fix routing header handling.
Hideaki Yoshifuji [Tue, 28 Sep 2004 20:25:48 +0000 (05:25 +0900)]
[IPV6] Fix routing header handling.

We need to rewind skb pointers when we forward a packet to other host
because dst_input() assumes that skb->data points head of ipv6 protocol header.

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
22 years ago[IPX]: Make sure sockaddr_ipx objects are initialized completely.
Colin Phipps [Tue, 28 Sep 2004 07:13:57 +0000 (00:13 -0700)]
[IPX]: Make sure sockaddr_ipx objects are initialized completely.

Signed-off-by: Adnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[PKT_SCHED]: Remove unneeded line in sch_sfq.c
Thomas Graf [Tue, 28 Sep 2004 07:08:16 +0000 (00:08 -0700)]
[PKT_SCHED]: Remove unneeded line in sch_sfq.c

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[CRYPTO]: Whirlpool algorithm updates.
Aaron Grothe [Tue, 28 Sep 2004 07:03:47 +0000 (00:03 -0700)]
[CRYPTO]: Whirlpool algorithm updates.

Signed-off-by: Aaron Grothe <ajgrothe@yahoo.com>
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[PKT_SCHED]: Report qdisc parent to userspace
Thomas Graf [Tue, 28 Sep 2004 06:59:09 +0000 (23:59 -0700)]
[PKT_SCHED]: Report qdisc parent to userspace

Report parent classid of a qdisc back to userspace. Without this there
is no way for userspace to see if the qdisc is attached to a class
other than parsing all class trees of the link and check all tcm_info
fields in the leaf classes.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[TCP]: Move TSO mss calcs to tcp_current_mss()
David S. Miller [Tue, 28 Sep 2004 06:46:58 +0000 (23:46 -0700)]
[TCP]: Move TSO mss calcs to tcp_current_mss()

Based upon a bug fix patch and suggestions from
Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[TCP]: Uninline tcp_current_mss().
David S. Miller [Tue, 28 Sep 2004 06:26:54 +0000 (23:26 -0700)]
[TCP]: Uninline tcp_current_mss().

Also fix the return value of tcp_sync_mss() to
be unsigned.

Signed-off-by: David S. Miller <davem@davemloft.net>
22 years agoMerge nuts.davemloft.net:/disk1/BK/network-2.6
David S. Miller [Tue, 28 Sep 2004 05:27:54 +0000 (22:27 -0700)]
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6

22 years agoConvert system suspend states to proper PCI device states.
Linus Torvalds [Tue, 28 Sep 2004 03:02:28 +0000 (20:02 -0700)]
Convert system suspend states to proper PCI device states.

22 years agoMerge bk://kernel.bkbits.net//home/mochel/linux-2.6-power
Linus Torvalds [Tue, 28 Sep 2004 02:53:22 +0000 (19:53 -0700)]
Merge bk://kernel.bkbits.net//home/mochel/linux-2.6-power
into ppc970.osdl.org:/home/torvalds/v2.6/linux

22 years ago[PATCH] partial io completion problem
Jens Axboe [Tue, 28 Sep 2004 02:15:02 +0000 (19:15 -0700)]
[PATCH] partial io completion problem

There's an issue with bio_uncopy_user() in that it expects ->bv_len to
be untouched from io submission to io completion, which it wont be for
some transfer lengths on some hardware. So we end up not copying all the
data back to user space, not so good. This patch adds a bio_map_data
local structure to track the io_vec.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years agoMerge http://oss.sgi.com:8090/xfs-linux-2.6
Linus Torvalds [Tue, 28 Sep 2004 02:06:30 +0000 (19:06 -0700)]
Merge http://oss.sgi.com:8090/xfs-linux-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

22 years ago[XFS] Make xfssyncd more generic, hand off out-of-space flushing to it;
Nathan Scott [Wed, 29 Sep 2004 00:15:42 +0000 (10:15 +1000)]
[XFS] Make xfssyncd more generic, hand off out-of-space flushing to it;
fixes two deadlocks when near-full and fixes a 4KSTACKS problem in XFS.

SGI Modid: xfs-linux:xfs-kern:19600a
Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years ago[XFS] Update XFS quota header - add macros, use standard gpl template.
Nathan Scott [Wed, 29 Sep 2004 00:05:50 +0000 (10:05 +1000)]
[XFS] Update XFS quota header - add macros, use standard gpl template.

Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years ago[XFS] fix handling of bad inodes
Christoph Hellwig [Wed, 29 Sep 2004 00:01:43 +0000 (10:01 +1000)]
[XFS] fix handling of bad inodes

SGI Modid: xfs-linux:xfs-kern:179634a
Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years ago[XFS] handle nfs requesting ino 0 gracefully
Christoph Hellwig [Tue, 28 Sep 2004 23:54:12 +0000 (09:54 +1000)]
[XFS] handle nfs requesting ino 0 gracefully

SGI Modid: xfs-linux:xfs-kern:179624a
Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years ago[XFS] Add nosymlinks inode flag for the security folks, reserve
Nathan Scott [Tue, 28 Sep 2004 23:52:14 +0000 (09:52 +1000)]
[XFS] Add nosymlinks inode flag for the security folks, reserve
projinherit flag.

SGI Modid: xfs-linux:xfs-kern:179567a
Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years ago[XFS] Ensure we update the wbc pages skipped count correctly when
Nathan Scott [Tue, 28 Sep 2004 23:48:57 +0000 (09:48 +1000)]
[XFS] Ensure we update the wbc pages skipped count correctly when
writing pages.

SGI Modid: xfs-linux:xfs-kern:179566a
Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years ago[XFS] Need to vn_revalidate after dm_set_fileattr
Dean Roehrich [Tue, 28 Sep 2004 23:45:54 +0000 (09:45 +1000)]
[XFS] Need to vn_revalidate after dm_set_fileattr

SGI Modid: xfs-linux:xfs-kern:179137a
Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years ago[XFS] Ensure bytes read statistic is not updated when the generic
Nathan Scott [Tue, 28 Sep 2004 23:42:29 +0000 (09:42 +1000)]
[XFS] Ensure bytes read statistic is not updated when the generic
routines fail.

SGI Modid: xfs-linux:xfs-kern:178890a
Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years ago[XFS] Convert to list_for_each_entry_safe form in reclaim list walk.
Nathan Scott [Tue, 28 Sep 2004 23:29:27 +0000 (09:29 +1000)]
[XFS] Convert to list_for_each_entry_safe form in reclaim list walk.

SGI Modid: xfs-linux:xfs-kern:178673a
Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years ago[XFS] Fix some locking oddities in extended attributes code (ilock
Nathan Scott [Tue, 28 Sep 2004 23:27:33 +0000 (09:27 +1000)]
[XFS] Fix some locking oddities in extended attributes code (ilock
excl vs shared).

SGI Modid: xfs-linux:xfs-kern:178671a
Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years ago[XFS] Fix incorrect use of do_div on realtime device growfs code path.
Nathan Scott [Tue, 28 Sep 2004 23:25:04 +0000 (09:25 +1000)]
[XFS] Fix incorrect use of do_div on realtime device growfs code path.

SGI Modid: xfs-linux:xfs-kern:178670a
Signed-off-by: Nathan Scott <nathans@sgi.com>
22 years agoMerge cantab.net:/home/src/bklinux-2.6
Anton Altaparmakov [Mon, 27 Sep 2004 22:37:09 +0000 (23:37 +0100)]
Merge cantab.net:/home/src/bklinux-2.6
into cantab.net:/home/src/ntfs-2.6

22 years agoMerge flatcap.org:/home/flatcap/backup/bk/linux-2.6
Richard Russon [Mon, 27 Sep 2004 18:26:27 +0000 (19:26 +0100)]
Merge flatcap.org:/home/flatcap/backup/bk/linux-2.6
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

22 years ago[TCP]: Fix third arg to __tcp_trim_head().
David S. Miller [Mon, 27 Sep 2004 15:37:27 +0000 (08:37 -0700)]
[TCP]: Fix third arg to __tcp_trim_head().

Noted by Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[NETLINK]: Kill export of netlink_broadcast_deliver.
Herbert Xu [Mon, 27 Sep 2004 15:08:00 +0000 (08:08 -0700)]
[NETLINK]: Kill export of netlink_broadcast_deliver.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[TCP]: Use mss_cache_std in tcp_init_metrics().
Herbert Xu [Mon, 27 Sep 2004 15:00:18 +0000 (08:00 -0700)]
[TCP]: Use mss_cache_std in tcp_init_metrics().

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[NET]: Neighbour cache statistics like rt_stat.
David S. Miller [Mon, 27 Sep 2004 14:57:01 +0000 (07:57 -0700)]
[NET]: Neighbour cache statistics like rt_stat.

Add rtstat-like per-cpu statistics to the neighbour cache core.

Signed-off-by: Harald Welte <laforge@gnumonks.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[TCP]: Fix congestion window expansion when using TSO.
David S. Miller [Mon, 27 Sep 2004 14:50:11 +0000 (07:50 -0700)]
[TCP]: Fix congestion window expansion when using TSO.

We only do congestion window expansion on full packet
ACKs.  We should do it for ACKs of sub-packets of a
TSO frame as well.

Signed-off-by: David S. Miller <davem@davemloft.net>
22 years agoAdd __user annotation to PR_SET_NAME
Linus Torvalds [Mon, 27 Sep 2004 09:37:15 +0000 (02:37 -0700)]
Add __user annotation to PR_SET_NAME

22 years ago[TIME]: Put jiffies_to_usecs in time.h
Stephen Hemminger [Mon, 27 Sep 2004 06:59:14 +0000 (23:59 -0700)]
[TIME]: Put jiffies_to_usecs in time.h

Move local version put in tcp_diag.c into time.h
where it belongs.  Also, make it smarted about HZ
values math.

Based upon suggestions from Joe Perches <joe@Perches.com>

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years agoMerge bk://212.42.230.204/netfilter-2.6
David S. Miller [Mon, 27 Sep 2004 05:16:02 +0000 (22:16 -0700)]
Merge bk://212.42.230.204/netfilter-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6

22 years agoMerge nuts.davemloft.net:/disk1/BK/network-2.6
David S. Miller [Mon, 27 Sep 2004 05:13:05 +0000 (22:13 -0700)]
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6

22 years agoMerge bk://bk.skbuff.net:20609/linux-2.6-refcnt/
David S. Miller [Mon, 27 Sep 2004 05:06:08 +0000 (22:06 -0700)]
Merge bk://bk.skbuff.net:20609/linux-2.6-refcnt/
into nuts.davemloft.net:/disk1/BK/net-2.6

22 years agoMerge flatcap.org:/home/flatcap/backup/bk/linux-2.6
Richard Russon [Mon, 27 Sep 2004 05:04:42 +0000 (06:04 +0100)]
Merge flatcap.org:/home/flatcap/backup/bk/linux-2.6
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

22 years ago[TCP]: Westwood cleanup
Stephen Hemminger [Mon, 27 Sep 2004 05:00:50 +0000 (22:00 -0700)]
[TCP]: Westwood cleanup

Westwood code cleanup;
* use const.
* avoid needless paren's and returns
* inline acked_count (called once)

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[TCP]: Diagnostics enhancement for westwood
Stephen Hemminger [Mon, 27 Sep 2004 04:59:44 +0000 (21:59 -0700)]
[TCP]: Diagnostics enhancement for westwood

Enhancement to tcp diagnostics used by ss command.
* use jiffies_to_usecs/msec instead of hardcode math
* report bandwidth for Westwood

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[TCP]: Choose congestion algorithm at initialization.
Stephen Hemminger [Mon, 27 Sep 2004 04:58:11 +0000 (21:58 -0700)]
[TCP]: Choose congestion algorithm at initialization.

The choice of congestion algorithm needs to be made when connection
is setup to avoid problems when the sysctl values change later and the
necessary data hasn't been collected.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
22 years ago[IPV4]: Fix fib_alias TOS walking and insertion.
Julian Anastasov [Mon, 27 Sep 2004 04:48:17 +0000 (21:48 -0700)]
[IPV4]: Fix fib_alias TOS walking and insertion.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>'
22 years ago[NET]: Remove INCOMPLETE checks from neigh_forced_gc().
David S. Miller [Mon, 27 Sep 2004 04:46:12 +0000 (21:46 -0700)]
[NET]: Remove INCOMPLETE checks from neigh_forced_gc().

Signed-off-by: David S. Miller <davem@davemloft.net>
22 years agoMerge http://linux-ntfs.bkbits.net/ldm-2.6
Linus Torvalds [Mon, 27 Sep 2004 01:31:18 +0000 (18:31 -0700)]
Merge http://linux-ntfs.bkbits.net/ldm-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

22 years agoUpdate for the LDM driver (fs/partitions/ldm.c): The last_vblkd_seq can
Anton Altaparmakov [Mon, 27 Sep 2004 16:32:12 +0000 (17:32 +0100)]
Update for the LDM driver (fs/partitions/ldm.c): The last_vblkd_seq can
be before the end of the vmdb, just make sure it is not out of bounds.
If it is abort.  If it is not just continue happily.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
22 years ago[PATCH] Remove stray 0 from drivers/video/Makefile
Ian Campbell [Mon, 27 Sep 2004 01:30:14 +0000 (18:30 -0700)]
[PATCH] Remove stray 0 from drivers/video/Makefile

The reordering of the drivers in drivers/video/Makefile introduced a
stray 0 into the pxafb.

Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years agoMerge coreworks.de:/home/kaber/src/bk-repos/linux-2.6
Patrick McHardy [Mon, 27 Sep 2004 01:30:05 +0000 (03:30 +0200)]
Merge coreworks.de:/home/kaber/src/bk-repos/linux-2.6
into coreworks.de:/home/kaber/src/nf/netfilter-2.6

22 years ago[NETFILTER]: Convert icmp conntrack protocol to skb_header_pointer
Patrick McHardy [Mon, 27 Sep 2004 01:20:58 +0000 (03:20 +0200)]
[NETFILTER]: Convert icmp conntrack protocol to skb_header_pointer

Signed-off-by: Patrick McHardy <kaber@trash.net>
22 years ago[NETFILTER]: Convert udp conntrack protocol to skb_header_pointer
Patrick McHardy [Mon, 27 Sep 2004 01:18:51 +0000 (03:18 +0200)]
[NETFILTER]: Convert udp conntrack protocol to skb_header_pointer

Signed-off-by: Patrick McHardy <kaber@trash.net>
22 years ago[NETFILTER]: Convert sctp conntrack protocol to skb_header_pointer
Patrick McHardy [Mon, 27 Sep 2004 01:17:39 +0000 (03:17 +0200)]
[NETFILTER]: Convert sctp conntrack protocol to skb_header_pointer

Signed-off-by: Patrick McHardy <kaber@trash.net>
22 years ago[NETFILTER]: Convert sctp match to skb_header_pointer
Patrick McHardy [Mon, 27 Sep 2004 01:16:04 +0000 (03:16 +0200)]
[NETFILTER]: Convert sctp match to skb_header_pointer

Signed-off-by: Patrick McHardy <kaber@trash.net>
22 years ago[NETFILTER]: make ipt_helper depend on ipt_conntrack again
Patrick McHardy [Mon, 27 Sep 2004 01:14:34 +0000 (03:14 +0200)]
[NETFILTER]: make ipt_helper depend on ipt_conntrack again

Signed-off-by: Patrick McHardy <kaber@trash.net>
22 years ago[NETFILTER]: Fill hole in netfilter skb fields on 64bit
Patrick McHardy [Mon, 27 Sep 2004 01:13:21 +0000 (03:13 +0200)]
[NETFILTER]: Fill hole in netfilter skb fields on 64bit

Signed-off-by: Patrick McHardy <kaber@trash.net>
22 years ago[PATCH] ppc64: Make the DART "iommu" code more generic
Benjamin Herrenschmidt [Mon, 27 Sep 2004 00:24:09 +0000 (17:24 -0700)]
[PATCH] ppc64: Make the DART "iommu" code more generic

The "DART" iommu used on Apple U3 chipset will appear into 3rd party
products soon, thus the code shouldn't be named "pmac_*" anymore.

Also, the explicit config option is no longer needed, there is no
reason to build a PowerMac kernel without the iommu support, and
it can always be disabled at runtime with a cmdline option for
testing or debugging.

This patch do the appropriate renaming and makes the config option
implicit & selected when pmac support is included.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years ago[PATCH] ppc64: Remote some userland-only stuff from kernel header
Benjamin Herrenschmidt [Mon, 27 Sep 2004 00:23:43 +0000 (17:23 -0700)]
[PATCH] ppc64: Remote some userland-only stuff from kernel header

include/asm-ppc64/systemcfg.h defines a structure that currently gets
exposed to userland via /proc, and which I intend to deprecate in the
near future once I have better alternatives available.

In the meantime, this patch removes a bunch of stuff from this file that
were only defined for non-__KERNEL__, like an inline function for
getting to that struture via /proc, and some CPU & platform type
definitions that were duplicates of the ones in asm-ppc64/processor.h.
These things have nothing to do in a kernel header.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years ago[PATCH] ppc64: Fix spelling error in callback name
Benjamin Herrenschmidt [Mon, 27 Sep 2004 00:23:31 +0000 (17:23 -0700)]
[PATCH] ppc64: Fix spelling error in callback name

A small spelling error slipped into a new ppc_md. platform call I added
in my last patch. Not very problematic but worth fixing before any code
using the new call gets pushed.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years ago[PATCH] Add wait_event_timeout()
Russell King [Mon, 27 Sep 2004 00:23:19 +0000 (17:23 -0700)]
[PATCH] Add wait_event_timeout()

There appears to be one case missing from the wait_event() family - the
uninterruptible timeout wait.  The following patch adds this.

This wait is particularly useful when (eg) you wish to pass work off to an
interrupt handler to perform, but also want to know if the hardware has
decided to go gaga under you.  You don't want to sit around waiting for
something that'll never happen - you want to go and wack the gremlin which
caused the failure and retry.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years ago[PATCH] ppc64: fix CONFIG check typo
Stephen Rothwell [Mon, 27 Sep 2004 00:23:07 +0000 (17:23 -0700)]
[PATCH] ppc64: fix CONFIG check typo

This should allow sys_rtas to work again on PPC64 pSeries.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years agoMerge flatcap.org:/home/flatcap/backup/bk/linux-2.6
Richard Russon [Sun, 26 Sep 2004 05:38:42 +0000 (06:38 +0100)]
Merge flatcap.org:/home/flatcap/backup/bk/linux-2.6
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6

22 years ago[PATCH] bttv: fix DMA setup bug in latest update
Peter Osterlund [Sun, 26 Sep 2004 02:49:53 +0000 (19:49 -0700)]
[PATCH] bttv: fix DMA setup bug in latest update

This fixes the bug that made the card DMA lots of data to random memory
locations, causing lockups and instant reboots.

The problem was that the yoffset variable got modified inside the loop,
but the logic in the switch statement was meant to work on the initial
value of the yoffset variable.

(Bug fix extracted from
http://marc.theaimsgroup.com/?l=linux-kernel&m=109532814823565&w=2)

Signed-off-by: Peter Osterlund <petero2@telia.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years ago[PATCH] ppc64: fix 32-bit SI_TIMER conversion fix
Benjamin Herrenschmidt [Sun, 26 Sep 2004 02:46:13 +0000 (19:46 -0700)]
[PATCH] ppc64: fix 32-bit SI_TIMER conversion fix

Agh !

I had two patches, a broken one and a good one and ... of course I sent
the broken one, sorry :(

This fixes the broken fix.

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years agoNTFS: Change {const_,}cpu_to_le{16,32}(0) to just 0 as suggested by Al Viro.
Anton Altaparmakov [Sun, 26 Sep 2004 02:04:26 +0000 (03:04 +0100)]
NTFS: Change {const_,}cpu_to_le{16,32}(0) to just 0 as suggested by Al Viro.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
22 years agoNTFS: Convert final enum (fs/ntfs/logfile.h) to define to silence last
Anton Altaparmakov [Sun, 26 Sep 2004 01:45:09 +0000 (02:45 +0100)]
NTFS: Convert final enum (fs/ntfs/logfile.h) to define to silence last
      bitwise sparse warning.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
22 years agoMerge ssh://linux-ntfs@bkbits.net/ntfs-2.6-devel
Anton Altaparmakov [Sun, 26 Sep 2004 01:38:41 +0000 (02:38 +0100)]
Merge ssh://linux-ntfs@bkbits.net/ntfs-2.6-devel
into cantab.net:/home/src/ntfs-2.6-devel

22 years agoNTFS: Remove silly (__force le32) casts from __ntfs_is_magic{,p}
Anton Altaparmakov [Sun, 26 Sep 2004 01:24:30 +0000 (02:24 +0100)]
NTFS: Remove silly (__force le32) casts from __ntfs_is_magic{,p}
      helper functions.  Thanks to Al Viro for spotting them.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
22 years ago[IPV4]: Fix fa_list walking in fib_hash.c
Alexey Kuznetsov [Sat, 25 Sep 2004 12:47:58 +0000 (05:47 -0700)]
[IPV4]: Fix fa_list walking in fib_hash.c

Prevent accidently referencing f->fn_alias list
head as a real fib_alias object.

Signed-off-by: David S. Miller <davem@davemloft.net>
22 years agoMerge bk://are.twiddle.net/axp-2.6/
Linus Torvalds [Sat, 25 Sep 2004 12:37:35 +0000 (05:37 -0700)]
Merge bk://are.twiddle.net/axp-2.6/
into ppc970.osdl.org:/home/torvalds/v2.6/linux

22 years ago[ALPHA] Regenerate defconfig.
Richard Henderson [Sat, 25 Sep 2004 11:56:01 +0000 (04:56 -0700)]
[ALPHA] Regenerate defconfig.

22 years ago[ALPHA] Turn off GENERIC_IOMAP. Arrange for iomap routines
Richard Henderson [Sat, 25 Sep 2004 11:54:32 +0000 (04:54 -0700)]
[ALPHA] Turn off GENERIC_IOMAP.  Arrange for iomap routines
to be linked unconditionally.

22 years ago[PATCH] ppc64: Fix 32 bits conversion of SI_TIMER signals
Benjamin Herrenschmidt [Sat, 25 Sep 2004 11:41:38 +0000 (04:41 -0700)]
[PATCH] ppc64: Fix 32 bits conversion of SI_TIMER signals

The current 32 bits translation of the SI_TIMER is wrong on ppc64, causing
the tst-timer4 testcase of glibc to fail in 32 bits. This patch fixes it.

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years ago[PATCH] fix posix_locks_deadlock()
Matthew Wilcox [Sat, 25 Sep 2004 11:35:17 +0000 (04:35 -0700)]
[PATCH] fix posix_locks_deadlock()

The "blocked_list" used for POSIX deadlock detection should only contain
POSIX locks, or posix_locks_deadlock() can get confused.

As I've noted before (but never posted a patch), we should probably stop
checking for deadlock.  POSIX says it's optional for an implementation
to check for deadlock, and since the change to match on tgid, we can
report a deadlock when none exists.

[ Further explanation for Linus: POSIX locks and BSD locks don't block
  each other, so checking that the blocker is a POSIX lock also implies
  that the waiter is a POSIX lock. ]

22 years agoMake smbfs with UNIX extensions get file disk usage count right.
Linus Torvalds [Sat, 25 Sep 2004 08:51:42 +0000 (01:51 -0700)]
Make smbfs with UNIX extensions get file disk usage count right.

We need to convert from bytes to blocks, and we also need to
handle the fact that old smbd's will round up the disk usage
bytecount to even multiples of 1MB, and gracefully fall back
on an estimate based on the file size instead in that case.

Acked by Samuel Thibault who noted the problem in the first
place, and Jeremy Allison wrt smbd behavior.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
22 years agoMerge kanga.twiddle.home:/home/rth/work/linux/linus-2.6
Richard Henderson [Sat, 25 Sep 2004 07:38:38 +0000 (00:38 -0700)]
Merge kanga.twiddle.home:/home/rth/work/linux/linus-2.6
into kanga.twiddle.home:/home/rth/work/linux/axp-2.6

22 years ago[ALPHA] Fix bitops.h, kernel.h include loop.
Richard Henderson [Sat, 25 Sep 2004 07:12:19 +0000 (00:12 -0700)]
[ALPHA] Fix bitops.h, kernel.h include loop.