commit 6b6a93c6876ea1c530d5d3f68e3678093a27fab0
tree 24122979b411dcec6ff390fc9ae84ad9413128e9
parent e89227889cec6b66758b44c83f78dba337e5d699
parent 7686ee1ad976efeddf10583f013462c66408ae51
author Linus Torvalds <torvalds@g5.osdl.org> Sun, 24 Jul 2005 20:39:30 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sun, 24 Jul 2005 20:39:30 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit e89227889cec6b66758b44c83f78dba337e5d699
tree 44fbf495ca2d0827e44bcc449a0f5177228dbdd8
parent 4e8fd22bd421d7aa279bcb76189505a1f96bb7bf
parent db7d9a4eb700be766cc9f29241483dbb1e748832
author Linus Torvalds <torvalds@g5.osdl.org> Sun, 24 Jul 2005 20:38:44 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sun, 24 Jul 2005 20:38:44 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commit 7686ee1ad976efeddf10583f013462c66408ae51
tree 68e8cd513ab047d4e71fcd232fdca4e5b0a69366
parent 48647feed9f7a2d839c6ada12147b341833646e8
author Patrick McHardy <kaber@trash.net> Sun, 24 Jul 2005 19:44:23 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:44:23 -0700
[EMATCH]: Remove feature ifdefs in meta ematch.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit db7d9a4eb700be766cc9f29241483dbb1e748832
tree 48848384df15d9404ceab05867d7f4ef6b1a4bbe
parent cdd5186f753b23ab51f86679bdc4cc698ab0b893
author David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:36:26 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:36:26 -0700
[SPARC64]: Move syscall success and newchild state out of thread flags.
These two bits were accesses non-atomically from assembler
code. So, in order to eliminate any potential races resulting
from that, move these pieces of state into two bytes elsewhere
in struct thread_info.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cdd5186f753b23ab51f86679bdc4cc698ab0b893
tree 9de741421a4303d936687784d5a703641962c5d7
parent c5019a578f18cf3a76829626e91e5469dbd4a738
author David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:36:13 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:36:13 -0700
[SPARC64]: Privatize sun5_timer.
It is only used by some localized code in irq.c, and also
delete enable_prom_timer() as that is totally unused.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c5019a578f18cf3a76829626e91e5469dbd4a738
tree 64c8ad3526439ddda5de8262a56e8a52f58b0830
parent 620de54675e76f1369326bbe1fc75aff88917063
author David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:35:56 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:35:56 -0700
[SPARC64]: Kill totally unused inline functions from asm/spitfire.h
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 620de54675e76f1369326bbe1fc75aff88917063
tree e50b449c94843e15c4dfa964ada5b50f1876e497
parent 6593eaed814d50214d6056c683d52ac63153730e
author David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:35:42 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:35:42 -0700
[SPARC64]: Simplify asm/rwsem.h slightly.
rwsem_atomic_update and rwsem_atomic_add can be implemented
straightly using atomic_*() routines.
Also, rwsem_cmpxchgw() is totally unused, kill it.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6593eaed814d50214d6056c683d52ac63153730e
tree b5e803f1217dd26484a15816e84402d8d3ce8a84
parent 4b502421aac89c8d4e61ecc89a70065a33305a0b
author David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:35:28 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:35:28 -0700
[SPARC64]: Non-atomic bitops do not need volatile operations
Noticed this while comparing sparc64's bitops.h to ppc64's.
We can cast the volatile memory argument to be non-volatile.
While we're here, __inline__ --> inline.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4b502421aac89c8d4e61ecc89a70065a33305a0b
tree 81f1a6f285623e2eb6393cd0dc7dce50bbf6448e
parent 2d1aea8dd02ad35658864de52a3e0f9f033e63f4
author David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:35:08 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:35:08 -0700
[SPARC]: Fix __KERNEL_SYSCALLS__ defining in envctrl.c and bbc_envctrl.c
It needs to happen before any header includes because nowadays
some things implicitly include asm/unistd.h which ends up being
before the __KERNEL_SYSCALLS__ define gets done.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 2d1aea8dd02ad35658864de52a3e0f9f033e63f4
tree 23c30e31146d67dd1f0bd2bf6747cf2f9abfeddb
parent cb39d263e751f9cca8055bcacfe5ec863dfe2705
author Nishanth Aravamudan <nacc@us.ibm.com> Sun, 24 Jul 2005 19:34:47 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:34:47 -0700
[SPARC]: sbus/vfc_i2c: remove sleep_on() usage
Use wait-queue directly instead of the deprecated sleep_on()
function. This required adding a local wait-queue. Also use new (added in
separate patch to K-J) usecs to jiffies function to convert value.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cb39d263e751f9cca8055bcacfe5ec863dfe2705
tree 6b2bead3545fced8f8b1e8de54d1b0b52e109d24
parent 70c83375bb47cadd60fdb923ad913d4f4be75aba
author Nishanth Aravamudan <nacc@us.ibm.com> Sun, 24 Jul 2005 19:34:33 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:34:33 -0700
[SPARC]: sbus/envctrl: replace schedule_timeout() with msleep_interruptible()
Use msleep_interruptible() instead of schedule_timeout() to guarantee
the task delays as expected. Change the units of poll_interval to
msecs as it is only used in this delay.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 70c83375bb47cadd60fdb923ad913d4f4be75aba
tree 3453e8fb3622dfd56f6d41ca1f405a037b3306de
parent 4564203d76599973da9c5cbcd93057252414ac9e
author Nishanth Aravamudan <nacc@us.ibm.com> Sun, 24 Jul 2005 19:34:19 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:34:19 -0700
[SPARC]: sbus/aurora: replace schedule_timeout() with msleep_interruptible()
Use msleep_interruptible() instead of
schedule_timeout() to guarantee the task delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
commit 4564203d76599973da9c5cbcd93057252414ac9e
tree 57dd8422ea0ef4dffa3fe186ce904c0ef1ef86da
parent 2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4
author Adrian Bunk <bunk@stusta.de> Sun, 24 Jul 2005 19:33:55 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:33:55 -0700
[SPARC]: Remvoe APM_RTC_IS_GMT from config.
I can't see any effect of this option outside the i386-specific APM code.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 48647feed9f7a2d839c6ada12147b341833646e8
tree a98aa36be19ce7706cef71418f143d30af28b899
parent 227510c7f175c44b12cdff6eab316e53dbf71f92
author David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:30:28 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:30:28 -0700
[W1]: Do not use NFLOG netlink number.
Use the reserved by never used NETLINK_SKIP value instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 227510c7f175c44b12cdff6eab316e53dbf71f92
tree 157836fd8d477ad3287c29e8235a41f0ed5cad42
parent 2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4
author Cal Peake <cp@absolutedigital.net> Sun, 24 Jul 2005 19:30:06 -0700
committer David S. Miller <davem@davemloft.net> Sun, 24 Jul 2005 19:30:06 -0700
[IPV6]: fix implicit declaration of function `xfrm6_tunnel_unregister'
Signed-off-by: Cal Peake <cp@absolutedigital.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4e8fd22bd421d7aa279bcb76189505a1f96bb7bf
tree f23106b362b242eec555b16b34f8ad22f035c65a
parent 2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sun, 24 Jul 2005 12:13:40 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 24 Jul 2005 12:13:40 +0100
[PATCH] ARM SMP: Fix ARMv6 spinlock and semaphore implementations
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4
tree fddb2afa9f3f1c49823ee7cfa7bcc9767e888e79
parent c94c0d201f1c1a62184f4f220c1615347aafbee7
parent 056a8763fc036639441a6dc49b61e57bc632af6e
author Linus Torvalds <torvalds@g5.osdl.org> Sat, 23 Jul 2005 17:01:26 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 23 Jul 2005 17:01:26 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-serial
commit c94c0d201f1c1a62184f4f220c1615347aafbee7
tree ac2fe13e5686091ab9c3789cb40d50371ca270ef
parent 8ed693d29b25bbd88471ec043cc01581419d0481
parent 53776eb4acdd3ec576d75b61b656ef8d51e430ea
author Linus Torvalds <torvalds@g5.osdl.org> Sat, 23 Jul 2005 16:59:55 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 23 Jul 2005 16:59:55 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit 53776eb4acdd3ec576d75b61b656ef8d51e430ea
tree 2a4f0229d57e3164717b268fc7d92cf1c9d1146e
parent ab9b6339381d340779e8b5957561aed41155a270
author Lucas Correia Villa Real <lucasvr@gobolinux.org> Sun, 24 Jul 2005 00:15:46 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 24 Jul 2005 00:15:46 +0100
[PATCH] ARM: 2825/1: S3C2410: turns %d into %ld on DMA printk
Patch from Lucas Correia Villa Real
This patch replaces the sizeof()'s %d specifier by %ld on a S3C2410 DMA
printk.
Signed-off-by: Lucas Correia Villa Real <lucasvr@gobolinux.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 8ed693d29b25bbd88471ec043cc01581419d0481
tree 5a033028bcf3bebdc8a029eeaecc708432bbce93
parent 72538d8565b0205240d88591b72db3c7f3f1881a
parent 668d74c04c16bb69de564e25e85dd94eeb0175d9
author Luming Yu <luming.yu@intel.com> Sat, 23 Jul 2005 00:34:41 -0400
committer Len Brown <len.brown@intel.com> Sat, 23 Jul 2005 00:34:41 -0400
/home/lenb/linux-2.6 branch 'acpi-2.6.12'
commit 668d74c04c16bb69de564e25e85dd94eeb0175d9
tree 9eca71da4fcf1ef8074c698f80f2f4e5196f08da
parent d8683a0cb5d09cb7f19feefa708424a84577e68f
author Luming Yu <luming.yu@intel.com> Sat, 23 Jul 2005 00:26:33 -0400
committer Len Brown <len.brown@intel.com> Sat, 23 Jul 2005 00:26:33 -0400
ACPI: delete unnecessary EC console messages
http://bugzilla.kernel.org/show_bug.cgi?id=4534
Signed-off-by: Luming Yu <luming.yu@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 72538d8565b0205240d88591b72db3c7f3f1881a
tree f7d1a78787e8027b6144487580e1c811cdb4fc2a
parent 2847e3478c3d8119eedc3e0cb85a308b21f681dd
author Linus Torvalds <torvalds@evo.osdl.org> Fri, 22 Jul 2005 18:29:40 -0400
committer Linus Torvalds <torvalds@evo.osdl.org> Fri, 22 Jul 2005 18:29:40 -0400
Remove "noreplacement" kernel command line option.
It is no longer valid to not replace instructions, since we depend on
different behaviour depending on CPU capabilities.
If you need to limit the capabilities of the replacements (because the
boot CPU has features that non-boot CPU's do not have, for example), you
need to explicitly disable those capabilities that are not shared across
all CPU's.
For example, if your boot CPU has FXSR, but other CPU's in your system
do not, you need to use the "nofxsr" kernel command line, not disable
instruction replacement per se.
commit 2847e3478c3d8119eedc3e0cb85a308b21f681dd
tree 40e24b6a405331ae5fc9ed38b0d4872c84069891
parent 38afd6adf6bccd7176e88c07cac104d3639aa30d
author Linus Torvalds <torvalds@evo.osdl.org> Fri, 22 Jul 2005 18:19:20 -0400
committer Linus Torvalds <torvalds@evo.osdl.org> Fri, 22 Jul 2005 18:19:20 -0400
x86: use alternative instructions for fnsave/fxsave too
This one ends up using an inline asm format that claims to read memory
and then clobber it (rather than just write it directly), which made it
easier to use the existing "alternative_input()" infrastructure support.
Now the fxsave code matches the fxrstor.
commit 38afd6adf6bccd7176e88c07cac104d3639aa30d
tree 2142409984b609e51ef60b6a14318dd4e878718a
parent 8ed1383fb7b6685968588141d5934e0e6715e954
parent 261688d01ec07d3a265b8ace6ec68310fbd96a96
author Linus Torvalds <torvalds@g5.osdl.org> Fri, 22 Jul 2005 16:33:00 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 22 Jul 2005 16:33:00 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit 261688d01ec07d3a265b8ace6ec68310fbd96a96
tree c068cd8f4a1cf545ea4bfb68d3becc051b964d56
parent d3984a6b6abac6203868f0e9095c0ed9e33ece03
author David S. Miller <davem@davemloft.net> Fri, 22 Jul 2005 14:43:52 -0700
committer David S. Miller <davem@davemloft.net> Fri, 22 Jul 2005 14:43:52 -0700
[PKT_SCHED]: em_meta: Kill TCF_META_ID_{INDEV,SECURITY,TCVERDICT}
More unusable TCF_META_* match types that need to get eliminated
before 2.6.13 goes out the door.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
commit 8ed1383fb7b6685968588141d5934e0e6715e954
tree 7ee8476ec114dbab907e3acf4e8a9d0342bf6751
parent b339a18b81a1f6ca1455559594f5df872b9e59f4
author Linus Torvalds <torvalds@evo.osdl.org> Fri, 22 Jul 2005 16:06:16 -0400
committer Linus Torvalds <torvalds@evo.osdl.org> Fri, 22 Jul 2005 16:06:16 -0400
x86: make restore_fpu() use alternative assembler instructions
It's really just a single instruction, conditional on whether the CPU
supports FXSR or not, so implement it as such instead of making it a
function that queries FXSR dynamically.
This means that the instruction just gets automatically rewritten to the
correct one at boot-time.
commit d3984a6b6abac6203868f0e9095c0ed9e33ece03
tree a46aa663c646cfc93067c837407ead4357f0b955
parent 74bb421da7f39e70ab636ad46ef85ea1178786c5
author Patrick McHardy <kaber@trash.net> Fri, 22 Jul 2005 12:52:47 -0700
committer David S. Miller <davem@davemloft.net> Fri, 22 Jul 2005 12:52:47 -0700
[NETFILTER]: Fix ip6t_LOG MAC format
I broke this in the patch that consolidated MAC logging.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 74bb421da7f39e70ab636ad46ef85ea1178786c5
tree 11f2eba01e01f8094f57a1c16c6d454ce7b2430a
parent 21f930e4abdcb9649f26e5b959c14dddee4e600b
author Patrick McHardy <kaber@trash.net> Fri, 22 Jul 2005 12:51:38 -0700
committer David S. Miller <davem@davemloft.net> Fri, 22 Jul 2005 12:51:38 -0700
[NETFILTER]: Use correct byteorder in ICMP NAT
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 21f930e4abdcb9649f26e5b959c14dddee4e600b
tree 524b3bfee593f20a52fab80c7bb4da3ac0ad3ad8
parent d04b4f8c1c9766e49fad6a141fc61cb30db69a5c
author Patrick McHardy <kaber@trash.net> Fri, 22 Jul 2005 12:51:03 -0700
committer David S. Miller <davem@davemloft.net> Fri, 22 Jul 2005 12:51:03 -0700
[NETFILTER]: Wait until all references to ip_conntrack_untracked are dropped on unload
Fixes a crash when unloading ip_conntrack.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d04b4f8c1c9766e49fad6a141fc61cb30db69a5c
tree 4355aafff80fc9a09597d4990a45b51b30359cf3
parent 4c1217deeb148ff8ab838ba4f1875d0f52dea343
author Patrick McHardy <kaber@trash.net> Fri, 22 Jul 2005 12:50:29 -0700
committer David S. Miller <davem@davemloft.net> Fri, 22 Jul 2005 12:50:29 -0700
[NETFILTER]: Fix potential memory corruption in NAT code (aka memory NAT)
The portptr pointing to the port in the conntrack tuple is declared static,
which could result in memory corruption when two packets of the same
protocol are NATed at the same time and one conntrack goes away.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4c1217deeb148ff8ab838ba4f1875d0f52dea343
tree 9219e874ef71ac18b31e1028a5cde6d579c6fc23
parent 28e212fb360ce2568edd60b93d60683d5ad24146
author Patrick McHardy <kaber@trash.net> Fri, 22 Jul 2005 12:49:30 -0700
committer David S. Miller <davem@davemloft.net> Fri, 22 Jul 2005 12:49:30 -0700
[NETFILTER]: Fix deadlock in ip6_queue
Already fixed in ip_queue, ip6_queue was missed.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b339a18b81a1f6ca1455559594f5df872b9e59f4
tree 1c3a34047734e5923484353dbe710b167ad7c72b
parent f60f700876cd51de9de69f3a3c865d95e287a24d
author Linus Torvalds <torvalds@evo.osdl.org> Fri, 22 Jul 2005 15:23:47 -0400
committer Linus Torvalds <torvalds@evo.osdl.org> Fri, 22 Jul 2005 15:23:47 -0400
Fix up incorrect "unlikely()" on %gs reload in x86 __switch_to
These days %gs is normally the TLS segment, so it's no longer zero. As
a result, we shouldn't just assume that %fs/%gs tend to be zero
together, but test them independently instead.
Also, fix setting of debug registers to use the "next" pointer instead
of "current". It so happens that the scheduler will have set the new
current pointer before calling __switch_to(), but that's just an
implementation detail.
commit 28e212fb360ce2568edd60b93d60683d5ad24146
tree cde99771e1cd026648c7a80e44ae66b710920e78
parent 14a59e1829cd5782ad1a8979e594578f49f3e2c1
author David S. Miller <davem@davemloft.net> Fri, 22 Jul 2005 11:47:25 -0700
committer David S. Miller <davem@davemloft.net> Fri, 22 Jul 2005 11:47:25 -0700
[PKT_SCHED]: Kill TCF_META_ID_REALDEV from meta ematch.
It won't exist any longer when we shrink the SKB in 2.6.14,
and we should kill this off before anyone in userspace starts
using it.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Graf <tgraf@suug.ch>
commit 056a8763fc036639441a6dc49b61e57bc632af6e
tree 880795a56d5f1ecf77966d14be38c4234436c2eb
parent fbc0dc0df54be06586d712ebf6958816e3b1b2b7
author Russell King <rmk@dyn-67.arm.linux.org.uk> Fri, 22 Jul 2005 10:15:04 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri, 22 Jul 2005 10:15:04 +0100
[PATCH] Serial: No need to check for priv != NULL in remove_one
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 14a59e1829cd5782ad1a8979e594578f49f3e2c1
tree b2aa664412afa2c2a5eef47d485b11c410949798
parent 4acdbdbe5089c06d5e0c7e96783fcc4414ded00a
author Loic Le Loarer <loic.le-loarer+lk@polytechnique.org> Thu, 21 Jul 2005 14:16:54 -0700
committer David S. Miller <davem@davemloft.net> Thu, 21 Jul 2005 14:16:54 -0700
[EQL]: Proper num_slaves decrement
Signed-off-by: Loic Le Loarer <loic.le-loarer+lk@polytechnique.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4acdbdbe5089c06d5e0c7e96783fcc4414ded00a
tree 77629aef70bd92983518b6f5dd13c70a222c4cbb
parent 4aa49d130df9209707a97786a55a3f584b7345e9
author Rusty Russell <rusty@rustcorp.com.au> Thu, 21 Jul 2005 13:14:46 -0700
committer David S. Miller <davem@davemloft.net> Thu, 21 Jul 2005 13:14:46 -0700
[NETFILTER]: ip_conntrack_expect_related must not free expectation
If a connection tracking helper tells us to expect a connection, and
we're already expecting that connection, we simply free the one they
gave us and return success.
The problem is that NAT helpers (eg. FTP) have to allocate the
expectation first (to see what port is available) then rewrite the
packet. If that rewrite fails, they try to remove the expectation,
but it was freed in ip_conntrack_expect_related.
This is one example of a larger problem: having registered the
expectation, the pointer is no longer ours to use. Reference counting
is needed for ctnetlink anyway, so introduce it now.
To have a single "put" path, we need to grab the reference to the
connection on creation, rather than open-coding it in the caller.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ab9b6339381d340779e8b5957561aed41155a270
tree cecfa0997f8c9e8072bec6c4c4bc5fbac30afb8f
parent bd6f68af298cab4e059f8489b56e46ae36243fcc
author Russell King <rmk@dyn-67.arm.linux.org.uk> Wed, 20 Jul 2005 21:32:26 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Wed, 20 Jul 2005 21:32:26 +0100
[PATCH] ARM SMP: Mark mroe CPU init data with __cpuinitdata
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 4aa49d130df9209707a97786a55a3f584b7345e9
tree 1522de28c0277809afd1fd037f5c359fcee4fc4b
parent b72f6eccb0fc516070f2de469f73870cb6cb1149
author Francois Romieu <romieu@fr.zoreil.com> Wed, 20 Jul 2005 12:01:46 -0700
committer David S. Miller <davem@davemloft.net> Wed, 20 Jul 2005 12:01:46 -0700
[ATM]: zatm: mailbox converted to pci_alloc_consistent()
mailbox converted to pci_alloc_consistent()
- request_region() is not needed: zatm_init_one() issues
pci_request_regions();
- the warning related to kfree(zatm_dev->mbx_start) disappears;
Compiled with i386 and sparc64 as target.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b72f6eccb0fc516070f2de469f73870cb6cb1149
tree 47adfd4764346387af894dd3a25e2b2266187a67
parent 0303770deb834c15ca664a9d741d40f893c92f4e
author David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 14:13:54 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 14:13:54 -0700
[NET]: Fix tc_verd thinko in skb_clone()
It was overwriting the computer n->tc_verd value over
and over with skb->tc_verd, by mistake.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 0303770deb834c15ca664a9d741d40f893c92f4e
tree d48e2df54d3545052aaffeeeec1c34c214055056
parent c877efb207bf4629cfa97ac13412f7392a873485
author Patrick McHardy <kaber@trash.net> Tue, 19 Jul 2005 14:03:34 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 14:03:34 -0700
[NET]: Make ipip/ip6_tunnel independant of XFRM
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c877efb207bf4629cfa97ac13412f7392a873485
tree 2521cdfc0943c916d2322d2183f0c4194cb29827
parent 23a534e7b1ad2650002bbc236493791ac23440ee
author Stephen Hemminger <shemminger@osdl.org> Tue, 19 Jul 2005 14:01:51 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 14:01:51 -0700
[IPV4]: Fix up lots of little whitespace indentation stuff in fib_trie.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 23a534e7b1ad2650002bbc236493791ac23440ee
tree 76a8c8a1cb3ff915fdb337242a073f651998915d
parent eb3f8f5e22cdee8138e654963e371ad337830efb
author Adrian Bunk <bunk@stusta.de> Tue, 19 Jul 2005 14:00:53 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 14:00:53 -0700
[NET]: NETCONSOLE must depend on INET
NETCONSOLE=y and INET=n results in the following compile error:
net/built-in.o: In function `netpoll_parse_options':
: undefined reference to `in_aton'
net/built-in.o: In function `netpoll_parse_options':
: undefined reference to `in_aton'
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit eb3f8f5e22cdee8138e654963e371ad337830efb
tree 7f9f62017c24125d7a50bee4088d1240cb5bc6fe
parent abaacad9bcb3f118cc802f527ab5d7c41b63f83a
author Adrian Bunk <bunk@stusta.de> Tue, 19 Jul 2005 14:00:13 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 14:00:13 -0700
[NET]: BRIDGE_EBT_ARPREPLY must depend on INET
BRIDGE_EBT_ARPREPLY=y and INET=n results in the following compile error:
net/built-in.o: In function `ebt_target_reply':
ebt_arpreply.c:(.text+0x68fb9): undefined reference to `arp_send'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit abaacad9bcb3f118cc802f527ab5d7c41b63f83a
tree 00feb47b1bc9f2b1c3eced293fce47a54faf711c
parent 6aef4fdfeaec5f2c66415f2cafa98a3ff927501f
author Patrick McHardy <kaber@trash.net> Tue, 19 Jul 2005 13:59:17 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 13:59:17 -0700
[IPV4]: Don't select XFRM for ip_gre
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6aef4fdfeaec5f2c66415f2cafa98a3ff927501f
tree fc8fa275747dfeea29642e37103614dc1754440d
parent 86cf42e4e029b83110cf98692420239103363dbf
author Patrick McHardy <kaber@trash.net> Tue, 19 Jul 2005 13:58:40 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 13:58:40 -0700
[NET]: Only build flow.o if CONFIG_XFRM=y
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 86cf42e4e029b83110cf98692420239103363dbf
tree e1e4210051fc1ae9b06515b56933989448f77a59
parent 88e9fa8a54cf4d66ee8fc1d855e82de827233d74
author Duncan Sands <baldrick@free.fr> Tue, 19 Jul 2005 13:57:17 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 13:57:17 -0700
[ATM]: [speedtch] cure atm_printk() macro gcc-2.95 compile error
Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 88e9fa8a54cf4d66ee8fc1d855e82de827233d74
tree fc869a492d674a302ddbaf2fd352ee970d0518a2
parent 5938a7b580bb7a738ee349048565ac76e6f3f5d7
author Jesper Juhl <juhl-lkml@dif.dk> Tue, 19 Jul 2005 13:56:53 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 13:56:53 -0700
[ATM]: Trivial spelling fix patch for net/Kconfig
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5938a7b580bb7a738ee349048565ac76e6f3f5d7
tree df59a9cc06712310f847ddfec589d8e5919f359f
parent c9e42614585dddd544a56907ff5fd5ca55411967
author Victor Fusco <victor@cetuc.puc-rio.br> Tue, 19 Jul 2005 13:56:29 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 13:56:29 -0700
[ATM]: [ambassador] Fix the sparse warning "implicit cast to nocast type"
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c9e42614585dddd544a56907ff5fd5ca55411967
tree ed518a75e4e7d95a11a87c4b9580762ae10bc707
parent 5e8676d113a097e19d18492e85215f0f3cc86e43
author Victor Fusco <victor@cetuc.puc-rio.br> Tue, 19 Jul 2005 13:56:01 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 13:56:01 -0700
[ATM]: [firestream] fix the sparse warning "implicit cast to nocast type"
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5e8676d113a097e19d18492e85215f0f3cc86e43
tree c49a03512ab5a8b8529552e49829f38a1a405886
parent e1bd232b641a0d0ef184a5154409ef38aebb3155
author Olaf Hering <olh@suse.de> Tue, 19 Jul 2005 13:55:38 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 13:55:38 -0700
[ATM]: [he] remove linux/version.h include
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e1bd232b641a0d0ef184a5154409ef38aebb3155
tree c60395cf79f0e17a247dc1291ed4f8bea0ad1aa5
parent 322361b3712af97c19ab730b410f9ae5d9aad4c3
author Marcelo Feitoza Parisi <marcelo@feitoza.com.br> Tue, 19 Jul 2005 13:55:14 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 13:55:14 -0700
[ATM]: [idt77252] use time_after() macro
Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 322361b3712af97c19ab730b410f9ae5d9aad4c3
tree f78cc2a5017cffbccdabefa11bf76c0ec34d3908
parent 43f51fce0a637e6cdf1285b0fa09b8398ff14834
author Chas Williams <chas@cmf.nrl.navy.mil> Tue, 19 Jul 2005 13:54:44 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 13:54:44 -0700
[ATM]: allow bind() on point-to-multpoint svcs (from Martin Whitaker <martin_whitaker@ntlworld.com>)
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 43f51fce0a637e6cdf1285b0fa09b8398ff14834
tree 0c19a53319cc78db6f55201ccb2d5c599ddf6b83
parent 3f1c81ff10187396e6d0fd01df82ab0cec256c96
author Chas Williams <chas@cmf.nrl.navy.mil> Tue, 19 Jul 2005 13:54:19 -0700
committer David S. Miller <davem@davemloft.net> Tue, 19 Jul 2005 13:54:19 -0700
[ATM]: [zatm] eliminate kfree warning (from Tobias Hirning <sskyman@web.de>)
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 3f1c81ff10187396e6d0fd01df82ab0cec256c96
tree a94aa26eee1a29dcc0f909a504915efafeb79d05
parent 6876f95f201ce2d62367d85dd793c1fee351d7a6
author David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 17:10:55 -0700
committer David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 17:10:55 -0700
[EMATCH]: Kill TCF_META_ID_TCCLASSID reference from meta ematch as well.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6876f95f201ce2d62367d85dd793c1fee351d7a6
tree 44031f94643969ebaa7ee2379efc2babaef17c4a
parent 54208991e15fa00e37a9d172ac0d87191a832165
author Adrian Bunk <bunk@stusta.de> Mon, 18 Jul 2005 13:55:19 -0700
committer David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 13:55:19 -0700
[IPV4]: fix IP_FIB_HASH kconfig warning
This patch fixes the following kconfig warning:
net/ipv4/Kconfig:92:warning: defaults for choice values not supported
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 54208991e15fa00e37a9d172ac0d87191a832165
tree 9344b79fd780f2a840b3d4f4e6d4dd048ab9cd23
parent d1ad1ff299dd908d07c5e5f27f88bbdb235eb7a5
author Randy Dunlap <rdunlap@xenotime.net> Mon, 18 Jul 2005 13:45:12 -0700
committer David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 13:45:12 -0700
[NET]: Kconfig: NETCONSOLE and NETPOLL together
Put NETCONSOLE and NETPOLL options together since they are related.
This cuts down on the hassle of flipping back and forth between
the Networking menu and the Network drivers menu to change their
config settings.
Tested with menuconfig, gconfig, and xconfig.
gconfig has a small problem with this. I think that it's
a bug in gconfig and I will take it up with Romain Lievin.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d1ad1ff299dd908d07c5e5f27f88bbdb235eb7a5
tree 03f66679f4a153ec06fde913907f392503f4b5e5
parent ee71a29eb5e341fe977c5ad7a43782c29bd9cb9e
author Sridhar Samudrala <sri@us.ibm.com> Mon, 18 Jul 2005 13:44:10 -0700
committer David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 13:44:10 -0700
[SCTP]: Fix potential null pointer dereference while handling an icmp error
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ee71a29eb5e341fe977c5ad7a43782c29bd9cb9e
tree cbbfc9d2155a939c1735986d056e0dff131c4afe
parent e2bf521d9728bfae9b6c3d484614e5962d0b5afd
author Christophe Lucas <clucas@rotomalug.org> Mon, 18 Jul 2005 13:38:07 -0700
committer David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 13:38:07 -0700
[SCTP]: Audit return code of create_proc_*
From: Christophe Lucas <clucas@rotomalug.org>
Audit return of create_proc_* functions.
Signed-off-by: Christophe Lucas <clucas@rotomalug.org>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e2bf521d9728bfae9b6c3d484614e5962d0b5afd
tree 74a126835dc9e26fbca5080214f3cc1bb4f7c5ea
parent 37da647d994cdac7e0bc8d2a365fbda403939a2b
author Victor Fusco <victor@cetuc.puc-rio.br> Mon, 18 Jul 2005 13:36:38 -0700
committer David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 13:36:38 -0700
[NET]: Fix "nocast type" warnings in skbuff.h
From: Victor Fusco <victor@cetuc.puc-rio.br>
Fix the sparse warning "implicit cast to nocast type"
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 37da647d994cdac7e0bc8d2a365fbda403939a2b
tree 914de5c0c11403014db2a202ce1338a19edc6d48
parent 23af27eb8fa9ea8614138c4cded7a16cb4197a55
author Victor Fusco <victor@cetuc.puc-rio.br> Mon, 18 Jul 2005 13:35:43 -0700
committer David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 13:35:43 -0700
[NETLINK]: Fix "nocast type" warnings
From: Victor Fusco <victor@cetuc.puc-rio.br>
Fix the sparse warning "implicit cast to nocast type"
Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 23af27eb8fa9ea8614138c4cded7a16cb4197a55
tree e558c59c98a759663e8691fbf731e5eb3fc49bb6
parent 452f299da3253f65020143f743c2e207b752547b
author Patrick McHardy <kaber@trash.net> Mon, 18 Jul 2005 13:34:35 -0700
committer David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 13:34:35 -0700
[PKT_SCHED]: Kill TCF_META_ID_TCCLASSID.
Thomas Graf states:
> I used to mark such ids as obsolete in the header but since
> skb is on diet anyway and there has been no official
> iproute2 release with the ematch bits included it might be
> a better idea to remove the ids from the header completely.
> Those that have picked up my patch on netdev shouldn't care
> about a ABI breakage, actually I doubt that someone is using
> it already.
So here's the patch to remove it.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 452f299da3253f65020143f743c2e207b752547b
tree 56f02114d9e65d60c0f3a0658602e7e193f226bd
parent d7c7ed4dbc66c5f4dfa5615cdfc5009af3b3b137
author Thomas Graf <tgraf@suug.ch> Mon, 18 Jul 2005 13:30:53 -0700
committer David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 13:30:53 -0700
[PKT_SCHED]: Reduce branch mispredictions in pfifo_fast_dequeue
The current call to __qdisc_dequeue_head leads to a branch
misprediction for every loop iteration, the fact that the
most common priority is 2 makes this even worse. This issue
has been brought up by Eric Dumazet <dada1@cosmosbay.com>
but unlike his solution which was to manually unroll the loop,
this approach preserves the possibility to increase the number
of bands at compile time.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d7c7ed4dbc66c5f4dfa5615cdfc5009af3b3b137
tree 1a328a1cbfb59fb4392df6b6ed2b1fd0b74c4983
parent 4851d3aaa550b7b62553dd19fcadc7b586da4f17
author Thomas Graf <tgraf@suug.ch> Mon, 18 Jul 2005 13:29:49 -0700
committer David S. Miller <davem@davemloft.net> Mon, 18 Jul 2005 13:29:49 -0700
[PKT_SCHED]: Remove debugging leftover from textsearch ematch
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fbc0dc0df54be06586d712ebf6958816e3b1b2b7
tree 5de8a3c70a3e43af52317ae1df1d94612cba0ba5
parent 65cc3370ef3fb56b9b423f282a8204f8cce66e32
author Andrey Panin <pazke@donpac.ru> Mon, 18 Jul 2005 11:38:09 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon, 18 Jul 2005 11:38:09 +0100
[PATCH] Serial: Add support for SIIG Quartet serial card
Add support for SIIG Quartet Serial card. This card has Oxford
Semiconducor 16954 quad UART which is clocked by 10x faster
(18.432 MHz) quartz.
Signed-off-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 65cc3370ef3fb56b9b423f282a8204f8cce66e32
tree f7bbf935d43e5bb3897151fc40e964f8796708f9
parent f60f700876cd51de9de69f3a3c865d95e287a24d
author Ben Dooks <ben-linux@fluff.org> Mon, 18 Jul 2005 10:24:32 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon, 18 Jul 2005 10:24:32 +0100
[PATCH] ARM: 2818/1: BAST - Use platform device for SuperIO 16550s
Patch from Ben Dooks
Use platform device for the 16500 UARTs in the onboard
SuperIO controller.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit bd6f68af298cab4e059f8489b56e46ae36243fcc
tree 4f819ea9083fa9dc8260608c1984b050cd3b2bac
parent 772a9e631ccad0423ed6d08acb3a4b1084ae2613
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sun, 17 Jul 2005 21:35:41 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 17 Jul 2005 21:35:41 +0100
[PATCH] ARM SMP: Mark CPU init functions/data with __cpuinit/...data
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 772a9e631ccad0423ed6d08acb3a4b1084ae2613
tree cf4243b9f4ed2e8a8661f08588f2a1df6370896b
parent 246b49768bc96d942ab0e2a17aab6fc3d2e011da
author Sascha Hauer <sascha@saschahauer.de> Sun, 17 Jul 2005 20:15:36 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 17 Jul 2005 20:15:36 +0100
[PATCH] ARM: 2687/1: i.MX framebuffer: make dmacr register platform configurable
Patch from Sascha Hauer
The dmacr needs different settings on some boards. This patch makes the
register configurable by the platform part.
Also we have imxfb_disable_controller(), so lets use it.
Signed-off-by: Steven Scholz
Signed-off-by: Sascha Hauer
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 246b49768bc96d942ab0e2a17aab6fc3d2e011da
tree 57eb0344054e488e4800a14963eb8c5fa63a0afe
parent b66da4a4859b0be3f12575863bf1d873116d1947
author Alexander Schulz <alex@shark-linux.de> Sun, 17 Jul 2005 20:12:08 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 17 Jul 2005 20:12:08 +0100
[PATCH] ARM: 2816/1: Shark: boot kernel images bigger than 1 MB
Patch from Alexander Schulz
Up to now, shark kernels were limited to one megabyte compressed
size. As the kernels get bigger, this becomes more and more
uncomfortable. So I added a loop to copy 3 MB instead of one
and added some comments.
Signed-off-by: Alexander Schulz <alex@shark-linux.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit b66da4a4859b0be3f12575863bf1d873116d1947
tree 70312c230efd0420817906adc2733489026153e9
parent f60f700876cd51de9de69f3a3c865d95e287a24d
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sun, 17 Jul 2005 10:54:50 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun, 17 Jul 2005 10:54:50 +0100
[PATCH] ARM: Remove global nwfpe register variable
Recent changes to nwfpe broke the build with some gcc versions:
In file included from arch/arm/nwfpe/softfloat.c:33:
arch/arm/nwfpe/fpa11.h:32: global register variable follows a function definition
make[1]: *** [arch/arm/nwfpe/softfloat.o] Error 1
Since we now ensure that the kernel stack is empty when returning
to user space, we can now access the userspace registers with
reference to the kernel stack using current_thread_info(), rather
than remembering the stack pointer at the time nwfpe was called.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit f60f700876cd51de9de69f3a3c865d95e287a24d
tree 4ef50e96c385ed076465aac23f52902467e7d825
parent c6c621b3a977b20d7ceffd3debcacbe3de7c0e87
parent 6d283d271674b1127881ebf082266a2c3fe6e0e4
author Linus Torvalds <torvalds@g5.osdl.org> Sat, 16 Jul 2005 20:06:51 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 16 Jul 2005 20:06:51 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-serial
commit c6c621b3a977b20d7ceffd3debcacbe3de7c0e87
tree 04b52f33ef1e8e24a4d9fa2c37cf218f82ff968a
parent af6ea9ca23504fe620412826a420dca9c43a8bf6
parent b7523418f6af9093c462341c08c2233f44f7a28d
author Linus Torvalds <torvalds@g5.osdl.org> Sat, 16 Jul 2005 20:05:41 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 16 Jul 2005 20:05:41 -0700
Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit af6ea9ca23504fe620412826a420dca9c43a8bf6
tree 19bebbeb442a8d08ad29f2056665b5fdd9bf1478
parent 1fa4aad496b9c96fcde6c8f905a43ae6733e5a79
parent c514720716c7b109ff980f8b3cb93f9af872c91c
author Linus Torvalds <torvalds@g5.osdl.org> Sat, 16 Jul 2005 11:47:51 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 16 Jul 2005 11:47:51 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
commit 1fa4aad496b9c96fcde6c8f905a43ae6733e5a79
tree 46fed6895f9b25d8525a40c2221a2335c15257be
parent 9fb1759a3102c26cd8f64254a7c3e532782c2bb8
parent 19870da7ea2fc483bf73a189046a430fd9b01391
author Linus Torvalds <torvalds@g5.osdl.org> Sat, 16 Jul 2005 10:24:32 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Sat, 16 Jul 2005 10:24:32 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
commit b7523418f6af9093c462341c08c2233f44f7a28d
tree b44cc3d485eec69e5c0a29f0404b736fb015b2c7
parent 878cf4e1c7be6bffde3ace888a65ac3d43c127bb
author Alexander Schulz <alex@shark-linux.de> Sat, 16 Jul 2005 17:17:18 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat, 16 Jul 2005 17:17:18 +0100
[PATCH] ARM: 2815/1: Shark: new defconfig, fixes with __io and serial ports
Patch from Alexander Schulz
This patch brings a new default config file for the shark and
fixes a compilation issue with io addressing and a runtime
problem with the serial ports, where I corrected a wrong
regshift value.
These are all shark specific files so I hope it is ok to
put them in one patch.
Signed-off-by: Alexander Schulz <alex@shark-linux.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 878cf4e1c7be6bffde3ace888a65ac3d43c127bb
tree 80884b756e76fb0e553069d7a54ed01f4e17c9bd
parent 109d89ca0ee76138e04b41726b7f719c7df65e88
author Michael Burian <dynmail1@gassner-waagen.at> Sat, 16 Jul 2005 16:43:49 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat, 16 Jul 2005 16:43:49 +0100
[PATCH] ARM: 2794/1: Add "Image" and "mach-types.h" to dontdiff list
Patch from Michael Burian
comment in "mach-types.h" tells that it should not be patched
"Image" is a binary, just as zImage, uImage and friends are
Signed-off-by: Michael Burian <dynmail1@gassner-waagen.at>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 109d89ca0ee76138e04b41726b7f719c7df65e88
tree 3653f48740d7812e21e15d09648e58edbc0416b9
parent 54ea06f6afe85aaf419e51343d4e4b5599197113
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sat, 16 Jul 2005 16:43:33 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat, 16 Jul 2005 16:43:33 +0100
[PATCH] ARM: Allow register_undef_hook to be called with IRQs off
Preserve the interrupt status across a call to register_undef_hook.
This allows it to be called while interrupts are disabled.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 54ea06f6afe85aaf419e51343d4e4b5599197113
tree e486f20da3931e62f07014c4aaf8d7042d656151
parent 9fb1759a3102c26cd8f64254a7c3e532782c2bb8
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sat, 16 Jul 2005 15:21:51 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat, 16 Jul 2005 15:21:51 +0100
[PATCH] ARM: Convert bitops to use ARMv6 ldrex/strex instructions
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 6d283d271674b1127881ebf082266a2c3fe6e0e4
tree c84f09e47f474b8476fac3b2be91d4a5f06ea68c
parent 661f83a67c2e360d5a4d2406cc28379c909f94bf
author Olaf Hering <olh@suse.de> Sat, 16 Jul 2005 09:59:00 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat, 16 Jul 2005 09:59:00 +0100
[PATCH] Serial: Remove linux/version.h
changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 661f83a67c2e360d5a4d2406cc28379c909f94bf
tree e77b3940b4fcb4dc2e2ad854a367f8164c140544
parent d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sat, 16 Jul 2005 09:30:53 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat, 16 Jul 2005 09:30:53 +0100
[PATCH] Serial: Move deprecation of register_serial forward to September
I think it's about time to make the build a little more vocal about the
expiry of these functions. Due to recent discussions with problems in
the console initialisation vs power manglement, I'd like to move the
date forward to September.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 19870da7ea2fc483bf73a189046a430fd9b01391
tree 3f8d07e75dc9895c52c2184d28e3c43a84b0234b
parent 2c4eec9802ae753a4973f0a0d71f8d154e86fd31
author Thomas Gleixner <tglx@linutronix.de> Fri, 15 Jul 2005 14:53:51 +0100
committer Thomas Gleixner <tglx@mtd.linutronix.de> Sat, 16 Jul 2005 09:27:52 +0200
[MTD] NAND: Fix broken bad block scan for 16 bit devices
The previous change to read a single byte from oob breaks the
bad block scan on 16 bit devices, when the byte is on an odd
address. Read the complete oob for now.
Remove the unused arguments from check_short_pattern()
Move the wait for ready function so it is only executed when
consecutive reads happen.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 2c4eec9802ae753a4973f0a0d71f8d154e86fd31
tree 59c93e5616d487d41c52e3ccb86fe497a7049542
parent 5d157885f383ccc0660c011fa488ae4edb77ab16
parent d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83
author Thomas Gleixner <tglx@tglx.tec.linutronix.de> Sat, 16 Jul 2005 09:20:01 +0200
committer Thomas Gleixner <tglx@mtd.linutronix.de> Sat, 16 Jul 2005 09:20:01 +0200
Merge with rsync://fileserver/linux
commit 9fb1759a3102c26cd8f64254a7c3e532782c2bb8
tree b14426c49283b114594454c19168b84fd6cee4d8
parent d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83
author Siddha, Suresh B <suresh.b.siddha@intel.com> Fri, 15 Jul 2005 19:17:44 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 22:56:11 -0700
[PATCH] x86_64: TASK_SIZE fixes for compatibility mode processes
A malicious 32bit app can have an elf section at 0xffffe000. During
exec of this app, we will have a memory leak as insert_vm_struct() is
not checking for return value in syscall32_setup_pages() and thus not
freeing the vma allocated for the vsyscall page.
Check the return value and free the vma incase of failure.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83
tree e31e6ec7a1d9e8f6bbf8cdee2692eb42f4869f47
parent 38d84c3bd6dd22bdb1f797c87006931133d71aea
parent 46906c4415f88cebfad530917bada0835d651824
author Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 17:52:13 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 17:52:13 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
commit 38d84c3bd6dd22bdb1f797c87006931133d71aea
tree 19f67f841f1624879d96e5b34d184beea0380b55
parent c9f04f5847c17d9933c5bd795c6c3740e96058e9
author Patrick Boettcher <patrick.boettcher@desy.de> Fri, 15 Jul 2005 12:20:26 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 12:30:15 -0700
[PATCH] dvb: cx88 output mode fix
The output_mode needs to be set for the Hauppauge Nova-T DVB-T
(cx88-dvb.c).
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4851d3aaa550b7b62553dd19fcadc7b586da4f17
tree 0135b52b20a168053a25abd0649d4b9fa521873a
parent a8178345c4f12f4413e5620fc86a6b0381c41bc9
author Marcelo Feitoza Parisi <marcelo@feitoza.com.br> Fri, 15 Jul 2005 10:00:41 -0700
committer David S. Miller <davem@davemloft.net> Fri, 15 Jul 2005 10:00:41 -0700
[NET PCMCIA]: drivers/net/pcmcia/smc91c92_cs.c : Use of time_after macro
From: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Use of the time_after() macro, defined at linux/jiffies.h, which deal
with wrapping correctly and are nicer to read.
Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a8178345c4f12f4413e5620fc86a6b0381c41bc9
tree dd9cb8c953556d539eabd4137032873a6578e988
parent 9d853c3757ef74ded5ae564d68370f22208fb88b
author Marcelo Feitoza Parisi <marcelo@feitoza.com.br> Fri, 15 Jul 2005 09:59:26 -0700
committer David S. Miller <davem@davemloft.net> Fri, 15 Jul 2005 09:59:26 -0700
[WAN]: drivers/net/wan/: use of time_after macro
From: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Use of the time_after() macro, defined at linux/jiffies.h, which deal
with wrapping correctly and are nicer to read.
Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c9f04f5847c17d9933c5bd795c6c3740e96058e9
tree fe6ebfe74a330aa51898e2f61e93d4256d0a1f7c
parent 6a806c510de490318846b53bbfec463d02ca274b
author Robert Love <rml@novell.com> Fri, 15 Jul 2005 12:21:07 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 09:54:51 -0700
[PATCH] inotify: MAINTAINERS
Add a MAINTAINERS entry for Inotify.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6a806c510de490318846b53bbfec463d02ca274b
tree 7018abfd9db7856708bc2c578f48c30eab8855b1
parent a1287ba1ba810aae1f8b81e32560d5d3bf3ff9f0
author NeilBrown <neilb@cse.unsw.edu.au> Fri, 15 Jul 2005 03:56:35 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 09:54:51 -0700
[PATCH] md/raid1: clear bitmap when fullsync completes
We need to be careful differentiating between a resync of a complete array,
in which we can clear the bitmap, and a resync of a degraded array, in
which we cannot.
This patch cleans all that up.
Cc: Paul Clements <paul.clements@steeleye.com>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a1287ba1ba810aae1f8b81e32560d5d3bf3ff9f0
tree c16aef43738ee0bf32e3514065ad394d04980900
parent 6f97933d0fd13920d7d53b6e0107bb674b3a1f0b
author Michal Ostrowski <mostrows@watson.ibm.com> Fri, 15 Jul 2005 03:56:33 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 09:54:51 -0700
[PATCH] rocket.c: Fix ldisc ref count handling
If bailing out because there is nothing to receive in rp_do_receive(),
tty_ldisc_deref is not called. Failure to do so increases the ref count
and causes release_dev() to hang since it can't get the ref count to 0.
Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6f97933d0fd13920d7d53b6e0107bb674b3a1f0b
tree f6e5a75915e10747b8e472b9452db5a767c3340a
parent 35e422c967d3208f188e3096c9f603ac7333fb1b
author Robert Love <rml@novell.com> Fri, 15 Jul 2005 03:56:33 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 09:54:51 -0700
[PATCH] inotify: documentation update
Clean up and expand some of the inotify documentation.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 35e422c967d3208f188e3096c9f603ac7333fb1b
tree 48cd88fc92819a5c49805279f5ef75bd17bddeef
parent afa597ba20e9ef55fc6283c1a564854b1c9f13c0
author Alexey Dobriyan <adobriyan@gmail.com> Fri, 15 Jul 2005 03:56:32 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 09:54:51 -0700
[PATCH] visws: reexport pm_power_off
More fallout from the i386_ksyms.c cleanups.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit afa597ba20e9ef55fc6283c1a564854b1c9f13c0
tree 56cbfbca20a3c59ef6b1d149f67185e8e8f3a85c
parent c5287ba132ff742e595d42c28b66cbba19522c4e
author Carsten Otte <cotte@de.ibm.com> Fri, 15 Jul 2005 03:56:30 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 09:54:50 -0700
[PATCH] execute-in-place fixes
This patch includes feedback from Andrew and Christoph. Thanks for
taking time to review.
Use of empty_zero_page was eliminated to fix compilation for architectures
that don't have it.
This patch removes setting pages up-to-date in ext2_get_xip_page and all
bug checks to verify that the page is indeed up to date. Setting the page
state on mapping to userland is bogus. None of the code patchs involved
with these pages in mm cares about the page state.
still on my ToDo list: identify a place outside second extended where
__inode_direct_access should reside
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c5287ba132ff742e595d42c28b66cbba19522c4e
tree 26a33ea2e756586d9696c050449c0d5f1666e908
parent 1eb29128c644581fa51f822545921394ad4f719f
author Mauro Carvalho Chehab <mchehab@brturbo.com.br> Fri, 15 Jul 2005 03:56:28 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 09:54:50 -0700
[PATCH] v4l: bug fixes for tuner, cx88 and tea5767
- In CX88 code, some cards needs to have audio reprogramed after changing
video channel;
- Tuner autodetection code seems not to work on some cards. Now,
no_autodetect insmod option allows disabling autodetection code;
- Minor fixes in tea5767 to reduce integer trunc;
- There are some new Pixelview Ultra Pro cards that doesn't use TEA5767
for radio. As autodetection is capable of checking for tea, radio tuners
and addresses removed.
- CX88 version number incremented.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1eb29128c644581fa51f822545921394ad4f719f
tree 936f6c517e2d8acd927a0b9e30ab07ed8b9ae58f
parent 030babac6ae54df64ae3bba4685ecb1d8d8dd8c3
author Neil Brown <neilb@cse.unsw.edu.au> Fri, 15 Jul 2005 03:56:27 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 09:54:50 -0700
[PATCH] Fix raid0's attempt to divide by 64bit numbers
Apparently sector_div is only guaranteed to work with a 32bit divisor, even
on 64bit architectures. So allow for this in raid0.
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 030babac6ae54df64ae3bba4685ecb1d8d8dd8c3
tree 790efcef0208ef8d626d47fff0740a633301281d
parent ba460e48064edeb57e3398eb8972c58de33f11ea
author Nishanth Aravamudan <nacc@us.ibm.com> Fri, 15 Jul 2005 03:56:25 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Fri, 15 Jul 2005 09:54:50 -0700
[PATCH] vt.c build fix
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9d853c3757ef74ded5ae564d68370f22208fb88b
tree aaf87a1a75d7e1c449e058867a1c4883dcc34838
parent ba460e48064edeb57e3398eb8972c58de33f11ea
author Herbert Xu <herbert@gondor.apana.org.au> Fri, 15 Jul 2005 07:41:31 -0700
committer David S. Miller <davem@davemloft.net> Fri, 15 Jul 2005 07:41:31 -0700
[CRYPTO]: Fix zero-extension bug on 64-bit architectures.
Noticed by Ken-ichirou MATSUZAWA.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5d157885f383ccc0660c011fa488ae4edb77ab16
tree 0caba31219184fcf47fb7f91ef330217812cc149
parent ba460e48064edeb57e3398eb8972c58de33f11ea
author Thomas Gleixner <tglx@tglx.tec.linutronix.de> Fri, 15 Jul 2005 08:14:44 +0200
committer Thomas Gleixner <tglx@mtd.linutronix.de> Fri, 15 Jul 2005 08:14:44 +0200
[JFFS2] Fix node allocation leak
In the rare case of failing to write the cleanmarker
the allocated node was not freed.
Pointed out by Forrest Zhao
Initial cleanup by Joern Engel
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 46906c4415f88cebfad530917bada0835d651824
tree 44aef0f11d6499ed802f43949e0e8ad193d9716e
parent 514fd7fd01d378a7b5584c657d9807fc28f22079
author Ian Wienand <ianw@gelato.unsw.edu.au> Wed, 13 Jul 2005 21:09:00 -0700
committer Tony Luck <tony.luck@intel.com> Thu, 14 Jul 2005 09:21:47 -0700
[IA64] Fix undefined reference to can_cpei_retarget for simulator
The simulator build doesn't turn on ACPI, so doesn't have a definition
of can_cpei_retarget.
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit ba460e48064edeb57e3398eb8972c58de33f11ea
tree 1eefb36f0e5e63123a910abcb7b238c429c8ed0f
parent 98848fa83bb6a4572ad55daeb312182dec9bed58
author Matthias Urlichs <smurf@smurf.noris.de> Thu, 14 Jul 2005 00:33:47 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:26 -0700
[PATCH] Option Card driver update, Maintainer entry
This patch updates the Option Card driver:
- remove a deadlock
- add sponsor notice
- add new card
- renamed the device to what's usually printed on it
- removed some dead code
- clean up a bunch of irregular whitespace (end-of-line, tabs)
Also add a MAINTAINERS entry for the Option Card driver.
Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 98848fa83bb6a4572ad55daeb312182dec9bed58
tree 9221e935f4cd3bfb6da2422806aee41f2040ed2e
parent a2d2b5cb8e5d8787f009eeb3bbca52687bd42a77
author Olaf Hering <olh@suse.de> Thu, 14 Jul 2005 00:33:45 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:26 -0700
[PATCH] ratelimit the ieee1394 IR legacy activated messages
running coriander1 with an Apple iSight produces lots of dmesg output.
Jul 13 22:14:17 ibook kernel: ieee1394: raw1394: /dev/raw1394 device initialized
Jul 13 22:15:28 ibook kernel: ohci1394: fw-host0: IR legacy activated
Jul 13 22:15:59 ibook last message repeated 208 times
Jul 13 22:17:00 ibook last message repeated 762 times
Jul 13 22:18:01 ibook last message repeated 914 times
Jul 13 22:18:17 ibook last message repeated 238 times
Jul 13 22:18:17 ibook kernel: ieee1394: unsolicited response packet received - no tlabel match
Jul 13 22:18:17 ibook kernel: ohci1394: fw-host0: IR legacy activated
its less noisy with the patch:
Jul 14 08:03:08 ibook kernel: ieee1394: raw1394: /dev/raw1394 device initialized
Jul 14 08:03:26 ibook kernel: ohci1394: fw-host0: IR legacy activated
Jul 14 08:03:42 ibook last message repeated 10 times
Jul 14 08:03:47 ibook kernel: printk: 63 messages suppressed.
Jul 14 08:03:47 ibook kernel: ohci1394: fw-host0: IR legacy activated
Jul 14 08:03:52 ibook kernel: printk: 74 messages suppressed.
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Jody McIntyre <scjody@modernduck.com>
Cc: Ben Collins <bcollins@debian.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a2d2b5cb8e5d8787f009eeb3bbca52687bd42a77
tree 68590f6b94eaec2f30297503bcc71e2dee0bc790
parent a0d43df931870997467042931e8fb7657375d327
author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Thu, 14 Jul 2005 00:33:44 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:25 -0700
[PATCH] remove EXPORT_SYMBOL for root_dev
Remove ROOT_DEV after unexporting it in the previous patch, as requested time
ago by Christoph Hellwig.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a0d43df931870997467042931e8fb7657375d327
tree 1ef8099b25195a7612f0ba187b3c622f0cca9264
parent 20d0021394c1b070bf04b22c5bc8fdb437edd4c5
author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Thu, 14 Jul 2005 00:33:43 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:25 -0700
[PATCH] uml: hostfs: unuse ROOT_DEV
Minimal patch removing uses of ROOT_DEV; next patch unexports it. I've
opposed this, but I've planned to reintroduce the functionality without using
ROOT_DEV.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 20d0021394c1b070bf04b22c5bc8fdb437edd4c5
tree 283d0cd3bfdaec49ed2b29d568f5ceca5e3f1d2a
parent ecc354a90af90a80dcaccc750f5f3e5e7c83112d
author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Thu, 14 Jul 2005 00:33:43 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:25 -0700
[PATCH] uml: allow building as 32-bit binary on 64bit host
This patch makes the command:
make ARCH=um SUBARCH=i386
work on x86_64 hosts (with support for building 32-bit binaries). This is
especially needed since 64-bit UMLs don't support 32-bit emulation for guest
binaries, currently. This has been tested in all possible cases and works.
Only exception is that I've built but not tested a 64-bit binary, because I
hadn't a 64-bit filesystem available.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ecc354a90af90a80dcaccc750f5f3e5e7c83112d
tree 71f60a11ff19d4e5078731a7fae39972a745c3c5
parent 8e0a21812427313f8ee8521688e81bfcc6f207a2
author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Thu, 14 Jul 2005 00:33:41 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:25 -0700
[PATCH] uml: reintroduce pcap support
The pcap support was not working because of some linking problems (expressing
the construct in Kbuild was a bit difficult) and because there was no user
request. Now that this has come back, here's the support.
This has been tested and works on both 32 and 64-bit hosts, even when
"cross-"building 32-bit binaries.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8e0a21812427313f8ee8521688e81bfcc6f207a2
tree 356769be4834e02ce77850329896fe35dc2e4c1e
parent 1c30385ae479ec4774bdc1048726aeb15cde0d21
author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Thu, 14 Jul 2005 00:33:41 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:25 -0700
[PATCH] uml: fix hppfs error path
Fix the error message to refer to the error code, i.e. err, not count, plus
add some cosmetical fixes.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1c30385ae479ec4774bdc1048726aeb15cde0d21
tree c777f2a3210b60d19074c30940dfdbc9caa711bf
parent 2e5e55923e315e8198f46f24f7ca37e1fd9aa102
author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Thu, 14 Jul 2005 00:33:38 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:24 -0700
[PATCH] uml: gcc 2.95 fix and Makefile cleanup
1) Cleanup an ugly hyper-nested code in Makefile (now only the arith.
expression is passed through the host bash).
2) Fix a problem with GCC 2.95: according to a report from Raphael Bossek,
.remap_data : { arch/um/sys-SUBARCH/unmap_fin.o (.data .bss) } is expanded
into: .remap_data : { arch/um/sys-i386 /unmap_fin.o (.data .bss) }
(because I didn't use ## to join the two tokens), thus stopping linking. Pass
the whole path from the Makefile as a simple and nice fix.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Raphael Bossek <raphael.bossek@gmx.de>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2e5e55923e315e8198f46f24f7ca37e1fd9aa102
tree 251aa6211d8d822350bed40cc021c9bf710110a6
parent 1feb8d2d7396748fb3bd6795d09bbfbdd4c03dff
author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Thu, 14 Jul 2005 00:33:37 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:24 -0700
[PATCH] uml: consolidate modify_ldt
*) Reorganize the two cases of sys_modify_ldt to share all the reasonably
common code.
*) Avoid memory allocation when unneeded (i.e. when we are writing and the
passed buffer size is known), thus not returning ENOMEM (which isn't
allowed for this syscall, even if there is no strict "specification").
*) Add copy_{from,to}_user to modify_ldt for TT mode.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1feb8d2d7396748fb3bd6795d09bbfbdd4c03dff
tree 73d7dbb979a107859fb40730555cb10ca6b4cbbb
parent bcb01b8a67476e6f748086e626df8424cc27036d
author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Thu, 14 Jul 2005 00:33:36 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:24 -0700
[PATCH] uml: workaround host bug in "TT mode vs. NPTL link fix"
A big bug has been diagnosed on hosts running the SKAS patch and built with
CONFIG_REGPARM, due to some missing prevent_tail_call().
On these hosts, this workaround is needed to avoid triggering that bug,
because "to" is kept by GCC only in EBX, which is corrupted at the return of
mmap2().
Since to trigger this bug int 0x80 must be used when doing the call, it rarely
manifests itself, so I'd prefer to get this merged to workaround that host
bug, since it should cause no functional change. Still, you might prefer to
drop it, I'll leave this to you.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bcb01b8a67476e6f748086e626df8424cc27036d
tree 02b2f7931e6d62273dc866863f600ee0b2f945b5
parent 3952db66efee4f22f3c6a0fd02a1e7071556a8d6
author Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Thu, 14 Jul 2005 00:33:34 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:24 -0700
[PATCH] uml: fix lvalue for gcc4
Russell King <rmk+lkml@arm.linux.org.uk>
This construct is refused by GCC 4, so here's the (corrected) fix. Thanks to
Russell for noticing a stupid mistake I did when first sending this.
As he noted, the code is largely suboptimal however it currently works, and
will be fixed shortly. Just read the access_ok check on fp which is NULL, or
the pointer arithmetic below which should be done with a cast to void*:
frame = (struct rt_sigframe __user *)
round_down(stack_top - sizeof(struct rt_sigframe), 16) - 8;
The code shows clearly that has been taken from
arch/x86_64/kernel/signal.c:setup_rt_frame(), maybe in a bit of a hurry.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3952db66efee4f22f3c6a0fd02a1e7071556a8d6
tree 8dd07e8fb5b725d1ba8c43e9f66ad89f84093a4b
parent 514fd7fd01d378a7b5584c657d9807fc28f22079
author Michael Krufky <mkrufky@m1k.net> Thu, 14 Jul 2005 00:33:33 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Thu, 14 Jul 2005 09:00:24 -0700
[PATCH] dvb: LGDT3302 QAM lock bug fix
Fix QAM lock bug. Previously, it was necessary to first scan in VSB before
attempting to get a QAM lock.
Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 514fd7fd01d378a7b5584c657d9807fc28f22079
tree bda3910b7737a4fac464792657ffedcba185d799
parent 1e279dd855d15b72364b4103f872d67d8592647e
parent 99ad25a313bda566a346b46a6015afa65bc0a02b
author Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 15:48:33 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 15:48:33 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
commit c514720716c7b109ff980f8b3cb93f9af872c91c
tree 490a9578995705de69712893a190b67651bddc56
parent 07929dcb963786512c760dd3ecd148d89295e7e5
parent 1e279dd855d15b72364b4103f872d67d8592647e
author Anton Altaparmakov <aia21@cantab.net> Wed, 13 Jul 2005 23:09:23 +0100
committer Anton Altaparmakov <aia21@cantab.net> Wed, 13 Jul 2005 23:09:23 +0100
Automatic merge with /usr/src/ntfs-2.6.git.
commit 1e279dd855d15b72364b4103f872d67d8592647e
tree 088ef616453b91b6915e0576d233762a1e5a78d3
parent 3720bd8b1e16b41b9ec640bf91f12e1a1b5cb961
author Miles Bader <miles@gnu.org> Wed, 13 Jul 2005 14:40:03 +0900
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 12:25:48 -0700
[PATCH] v850: Align ___start___param to match parameter alignment
Signed-off-by: Miles Bader <miles@gnu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3720bd8b1e16b41b9ec640bf91f12e1a1b5cb961
tree fecdaa69be5fc1f934909b89a6e3ae2c79241dfe
parent a61caa8523a76e497f6b2a05350c892bc5ee402c
parent 6a8b4d319c52f8a3fdca46b185d001fbf0939911
author Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 12:19:30 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 12:19:30 -0700
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
commit 99ad25a313bda566a346b46a6015afa65bc0a02b
tree b9443fed1ab74f320c4ee0791864ee96d7c069df
parent f62c4a96f74d6c6dd56d1742697e94a5c2085e87
parent 9a556e89081b0c1c2f83cee915363b15a68a6f2d
author Tony Luck <tony.luck@intel.com> Wed, 13 Jul 2005 12:15:43 -0700
committer Tony Luck <tony.luck@intel.com> Wed, 13 Jul 2005 12:15:43 -0700
Auto merge with /home/aegl/GIT/linus
commit f62c4a96f74d6c6dd56d1742697e94a5c2085e87
tree 488dc6db60c7c3e8ef10fd79f175cff1a5426a4c
parent 59a0a8aa6ab6e46926e8d12694593267c0869440
author David Mosberger-Tang <David.Mosberger@acm.org> Tue, 12 Jul 2005 21:51:00 -0700
committer Tony Luck <tony.luck@intel.com> Wed, 13 Jul 2005 11:56:32 -0700
[IA64] Make PCDP work again.
Mark's patch added "attribute((packed))" for pcdp_uart, without
accounting for the fact that the structure definition _relied_ on
implicit padding by 6 bytes. Fix is to make the padding explicit.
Signed-off-by: David Mosberger-Tang <David.Mosberger@acm.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 59a0a8aa6ab6e46926e8d12694593267c0869440
tree e0ceb39701ee5018f95a44904dde6c7b7aa82068
parent 7c2a6c62c013a4ea57243536fc7f3987e4ba04bc
author Dean Nelson <dcn@sgi.com> Wed, 13 Jul 2005 05:45:00 -0700
committer Tony Luck <tony.luck@intel.com> Wed, 13 Jul 2005 11:52:45 -0700
[IA64] fix call of smp_processor_id() by XPC while
XPC calls smp_processor_id() twice from xpc_setup_infrastructure() with
preemption enabled, which gets flagged if 'DEBUG_PREEMPT=y'. This patch
replaces the two calls to smp_processor_id() by a single call to
raw_smp_processor_id() since any CPU within the partition will do.
Signed-off-by: Dean Nelson <dcn@sgi.com>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit a61caa8523a76e497f6b2a05350c892bc5ee402c
tree d4fb2ca050a31e47adf45e811017964c46ccf38c
parent f264cc28245d4d635d586be8c2148140726756dd
author Geert Uytterhoeven <geert@linux-m68k.org> Wed, 13 Jul 2005 12:56:42 +0200
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:44:27 -0700
[PATCH] Amiga joystick: Fix typo introduced by the open/close race fixes
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f264cc28245d4d635d586be8c2148140726756dd
tree b1ab054289acd3054e54d3caabaadaf1455f2d58
parent 96e2844999f99878fc5b03b81ccaa60580005b81
author Olof Johansson <olof@lixom.net> Wed, 13 Jul 2005 01:11:44 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:25:25 -0700
[PATCH] ppc64: add 970MP PVR
Add PVR value and tests for 970MP. Also switch to a simpler (but slightly
longer) check at init time for simplicity.
Signed-off-by: Olof Johansson <olof@austin.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 96e2844999f99878fc5b03b81ccaa60580005b81
tree 353c1bc9a5602d556e6741f4a261010cde45e93b
parent f13487c66c75f5db004a0631047309d9e7c5aab7
author David Gibson <david@gibson.dropbear.id.au> Wed, 13 Jul 2005 01:11:42 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:25:25 -0700
[PATCH] ppc64: kill bitfields in ppc64 hash code
This patch removes the use of bitfield types from the ppc64 hash table
manipulation code.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f13487c66c75f5db004a0631047309d9e7c5aab7
tree 19585562d0ffb0923ed6c2d829d44f10eb619482
parent 7ee91ec14bd4def036b4084da29869382078e44b
author Olaf Hering <olh@suse.de> Wed, 13 Jul 2005 01:11:41 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:25:25 -0700
[PATCH] ppc32: make -j12 all fails in uImage target
make -j zImage may call if_changed twice at the same time, the result is a
corrupted vmlinux.gz
Write to a temporary file for the time being until someone with make skills
fix the serialization properly.
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7ee91ec14bd4def036b4084da29869382078e44b
tree 5d4a99f6c0255184328c47f33258088b2ef0f8b1
parent 068e1b94bbd268f375349f68531829c8b7c210bc
author Steve Dickson <SteveD@redhat.com> Wed, 13 Jul 2005 01:10:47 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:25:24 -0700
[PATCH] NFS: procfs/sysctl interfaces for lockd do not work on x86_64
Allow the setting of NLM timeouts and grace periods through the proc and
sysclt interfaces on x86_64 architectures
Signed-off-by: Steve Dickson <steved@redhat.com>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 068e1b94bbd268f375349f68531829c8b7c210bc
tree 310708cce88df2f72a5f98d1cb67dc1d8fe19171
parent ddca3b80cef36cc668f924ef5154a79acb19ebd7
author Martin Schwidefsky <schwidefsky@de.ibm.com> Wed, 13 Jul 2005 01:10:46 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:25:24 -0700
[PATCH] s390: fadvise hint values.
Add special case for the POSIX_FADV_DONTNEED and POSIX_FADV_NOREUSE hint
values for s390-64. The user space values in the s390-64 glibc headers for
these two defines have always been 6 and 7 instead of 4 and 5. All 64 bit
applications therefore use the "wrong" values. To get these applications
working without recompiling the kernel needs to accept the "wrong" values.
Since the values for s390-31 are 4 and 5 the compat wrapper for fadvise64
and fadvise64_64 need to rewrite the values for 31 bit system calls.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ddca3b80cef36cc668f924ef5154a79acb19ebd7
tree 2cfb8ac6837682d975a1cb761360977ac54a6aef
parent 88bd5121d635136e01369141367f315665534b3c
author Guillaume Autran <gautran@mrv.com> Wed, 13 Jul 2005 01:10:45 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:25:24 -0700
[PATCH] ppc32: fix destroy_context() race condition
Fix for a race condition when a task gets preempted by another task while
executing the destroy_context(...) in a FEW_CONTEXTS environment.
mm->context == NO_CONTEXT but the context_map may indicate all contexts are
in use.
The solution to this problem is to disable kernel preemption while
destroying a MMU context.
Signed-off-by: Guillaume Autran <gautran@mrv.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 88bd5121d635136e01369141367f315665534b3c
tree 33de8dda3d77ebf7bf48864c464a36665f66497c
parent 9a556e89081b0c1c2f83cee915363b15a68a6f2d
author Anton Altaparmakov <aia21@cam.ac.uk> Wed, 13 Jul 2005 01:10:44 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:25:24 -0700
[PATCH] Fix soft lockup due to NTFS: VFS part and explanation
Something has changed in the core kernel such that we now get concurrent
inode write outs, one e.g via pdflush and one via sys_sync or whatever.
This causes a nasty deadlock in ntfs. The only clean solution
unfortunately requires a minor vfs api extension.
First the deadlock analysis:
Prerequisive knowledge: NTFS has a file $MFT (inode 0) loaded at mount
time. The NTFS driver uses the page cache for storing the file contents as
usual. More interestingly this file contains the table of on-disk inodes
as a sequence of MFT_RECORDs. Thus NTFS driver accesses the on-disk inodes
by accessing the MFT_RECORDs in the page cache pages of the loaded inode
$MFT.
The situation: VFS inode X on a mounted ntfs volume is dirty. For same
inode X, the ntfs_inode is dirty and thus corresponding on-disk inode,
which is as explained above in a dirty PAGE_CACHE_PAGE belonging to the
table of inodes ($MFT, inode 0).
What happens:
Process 1: sys_sync()/umount()/whatever... calls __sync_single_inode() for
$MFT -> do_writepages() -> write_page for the dirty page containing the
on-disk inode X, the page is now locked -> ntfs_write_mst_block() which
clears PageUptodate() on the page to prevent anyone else getting hold of it
whilst it does the write out (this is necessary as the on-disk inode needs
"fixups" applied before the write to disk which are removed again after the
write and PageUptodate is then set again). It then analyses the page
looking for dirty on-disk inodes and when it finds one it calls
ntfs_may_write_mft_record() to see if it is safe to write this on-disk
inode. This then calls ilookup5() to check if the corresponding VFS inode
is in icache(). This in turn calls ifind() which waits on the inode lock
via wait_on_inode whilst holding the global inode_lock.
Process 2: pdflush results in a call to __sync_single_inode for the same
VFS inode X on the ntfs volume. This locks the inode (I_LOCK) then calls
write-inode -> ntfs_write_inode -> map_mft_record() -> read_cache_page() of
the page (in page cache of table of inodes $MFT, inode 0) containing the
on-disk inode. This page has PageUptodate() clear because of Process 1
(see above) so read_cache_page() blocks when tries to take the page lock
for the page so it can call ntfs_read_page().
Thus Process 1 is holding the page lock on the page containing the on-disk
inode X and it is waiting on the inode X to be unlocked in ifind() so it
can write the page out and then unlock the page.
And Process 2 is holding the inode lock on inode X and is waiting for the
page to be unlocked so it can call ntfs_readpage() or discover that
Process 1 set PageUptodate() again and use the page.
Thus we have a deadlock due to ifind() waiting on the inode lock.
The only sensible solution: NTFS does not care whether the VFS inode is
locked or not when it calls ilookup5() (it doesn't use the VFS inode at
all, it just uses it to find the corresponding ntfs_inode which is of
course attached to the VFS inode (both are one single struct); and it uses
the ntfs_inode which is subject to its own locking so I_LOCK is irrelevant)
hence we want a modified ilookup5_nowait() which is the same as ilookup5()
but it does not wait on the inode lock.
Without such functionality I would have to keep my own ntfs_inode cache in
the NTFS driver just so I can find ntfs_inodes independent of their VFS
inodes which would be slow, memory and cpu cycle wasting, and incredibly
stupid given the icache already exists in the VFS.
Below is a patch that does the ilookup5_nowait() implementation in
fs/inode.c and exports it.
ilookup5_nowait.diff:
Introduce ilookup5_nowait() which is basically the same as ilookup5() but
it does not wait on the inode's lock (i.e. it omits the wait_on_inode()
done in ifind()).
This is needed to avoid a nasty deadlock in NTFS.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9a556e89081b0c1c2f83cee915363b15a68a6f2d
tree 74e2f68c4d04ab0fcf05dbd4f82c14169d639405
parent 5995f16b4a464c8a57de7c9d5ddf4758dbacad41
author Robert Love <rml@novell.com> Wed, 13 Jul 2005 13:49:23 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:09:31 -0700
[PATCH] inotify: misc cleanup
Really simple, basic cleanup.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5995f16b4a464c8a57de7c9d5ddf4758dbacad41
tree e26de11916f1f6234f954b262837501aca263da7
parent 0399cb08c54708db231d616f106f64d920e0b723
author Robert Love <rml@novell.com> Wed, 13 Jul 2005 12:38:39 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:09:31 -0700
[PATCH] inotify: event ordering
This rearranges the event ordering for "open" to be consistent with the
ordering of the other events.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0399cb08c54708db231d616f106f64d920e0b723
tree f0424d43c578f7c5c1e7aa6ea6ca1c906c7ac289
parent 153f805781d35c91ab2f54aa2b8930cc4cfc7e89
author Robert Love <rml@novell.com> Wed, 13 Jul 2005 12:38:18 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:09:31 -0700
[PATCH] inotify: move sysctl
This moves the inotify sysctl knobs to "/proc/sys/fs/inotify" from
"/proc/sys/fs". Also some related cleanup.
Signed-off-by: Robert Love <rml@novell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 153f805781d35c91ab2f54aa2b8930cc4cfc7e89
tree 90bb6279bec053f942aed60ecfb0580c79b0e422
parent c327ff6250fb558659ad689fe33f50524eda74e3
author James Bottomley <James.Bottomley@SteelEye.com> Wed, 13 Jul 2005 09:38:05 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 11:07:54 -0700
[PATCH] fix voyager subarchitecture EXPORT_SYMBOL breakage caused by i386_ksym reduction
This patch:
[PATCH] Remove i386_ksyms.c, almost
made files like smp.c do their own EXPORT_SYMBOLS. This means that all
subarchitectures that override these symbols now have to do the exports
themselves. This patch adds the exports for voyager (which is the most
affected since it has a separate smp harness). However, someone should
audit all the other subarchitectures to see if any others got broken.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c327ff6250fb558659ad689fe33f50524eda74e3
tree 57e0ed5a753c55f1693d7fe8628b4411ab5ae71d
parent c0ac515e2951dd2a999cfd21dea3fdc1055f1573
parent 59192ed9e7aa81b06a1803661419f7261afca1ad
author Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 10:37:36 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 10:37:36 -0700
Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
commit c0ac515e2951dd2a999cfd21dea3fdc1055f1573
tree cb4f8124f9302c3ad02037451b89fe98dca6b4ed
parent 6cd59f7a4119fef124677827a9b30684c2c8e674
author Jeff Mahoney <jeffm@suse.com> Wed, 13 Jul 2005 11:55:42 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 10:28:43 -0700
[PATCH] Lindent: ignore .indent.pro
When I recently submitted a Lindent patch, it turned out that my .indent.pro
options were also applied to the tree. This patch directs indent(1) to ignore
the .indent.pro directives and only use options specified on the command
line.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6cd59f7a4119fef124677827a9b30684c2c8e674
tree 084162f271f09b0d4787b92ae414cf0cc310f521
parent c32511e2718618f0b53479eb36e07439aa363a74
parent 73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc
author Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 10:12:50 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> Wed, 13 Jul 2005 10:12:50 -0700
Merge /home/torvalds/linux-2.6-arm
commit 6a8b4d319c52f8a3fdca46b185d001fbf0939911
tree cad5d67d42c73f690f4c3638cedebd1ec33273b6
parent 1b3035b7fcc72b6b36f2a3634dad832eb2453ce8
author Joern Engel <joern@wohnheim.fh-wedel.de> Wed, 13 Jul 2005 16:45:43 +0100
committer Thomas Gleixner <tglx@mtd.linutronix.de> Wed, 13 Jul 2005 19:04:04 +0200
[MTD] cfi_cmdset_0002: Plugged a mem leak.
Signed-off-by: Joern Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 59192ed9e7aa81b06a1803661419f7261afca1ad
tree 31f592365ad2ecf5eb606de10290da502fc7eb74
parent 6211502d7ee9e515e4458d0c0ebfbb70553dc7de
author Ian Dall <ian@beware.dropbear.id.au> Wed, 13 Jul 2005 09:15:18 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 13 Jul 2005 09:15:18 -0500
JFS: Need to be root to create files with security context
It turns out this is due to some inverted logic in xattr.c
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 6211502d7ee9e515e4458d0c0ebfbb70553dc7de
tree 24ab6b567f793f8dd1c1e3458769290df2bf8f52
parent f7f24758ac98a506770bc5910d33567610fa3403
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 13 Jul 2005 09:07:53 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 13 Jul 2005 09:07:53 -0500
JFS: Allow security.* xattrs to be set on symlinks
All of the different xattr namespaces have different rules.
user.* and ACL's are not allowed on symlinks, and since these were the
first xattrs implemented, I assumed there was no need to support xattrs
on symlinks. This one-line patch should fix it.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit f7f24758ac98a506770bc5910d33567610fa3403
tree ff7fad3d01bf9dc2e2e54b908f9fca4891e1ee72
parent b38a3ab3d1bb0dc3288f73903d4dc4672b5cd2d0
parent c32511e2718618f0b53479eb36e07439aa363a74
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 13 Jul 2005 08:57:38 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 13 Jul 2005 08:57:38 -0500
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 1b3035b7fcc72b6b36f2a3634dad832eb2453ce8
tree 728174d72943cc9b981a5843553551df62eddc41
parent a98a5d04f400ad112e59cadd739dbabf89417e60
parent c32511e2718618f0b53479eb36e07439aa363a74
author Thomas Gleixner <tglx@tglx.tec.linutronix.de> Wed, 13 Jul 2005 10:45:00 +0200
committer Thomas Gleixner <tglx@mtd.linutronix.de> Wed, 13 Jul 2005 10:45:00 +0200
Merge with rsync://fileserver/linux
commit 7c2a6c62c013a4ea57243536fc7f3987e4ba04bc
tree 02e3e1d9888f81110ba85bef531e5c695f6064ce
parent 08357f82d4decc48bbfd39ae30d5fe0754f7f576
author Christoph Lameter <clameter@sgi.com> Tue, 12 Jul 2005 16:03:00 -0700
committer Tony Luck <tony.luck@intel.com> Tue, 12 Jul 2005 16:12:55 -0700
[IA64] Altix pcibus_to_node implementation
The Altix subarch does not provide node information via ACPI. Instead hooks
are used to fixup pci structures. This patch determines the nodes for Altix
PCI busses.
Remote Bridges:
---------------
Altix supports remote I/O nodes without memory or processors but with bridges.
The TIOCA type of bridge is an AGP bridge and the PROM provides information
about the closest node. That information will be returned by pcibus_to_node.
The TIOCP remote bridge type is a PCI bridge but the PROM does not provide a
closest node id. pcibus_to_node will return -1 for devices on those bridges
meaning that device control structures may be allocated on any node.
Safeguard:
----------
Should the fixups result in invalid node information for a pci controller then
a warning will be printed and pcibus_to_node will return -1.
This patch also fixes the "FIXME" in sn_dma_alloc_coherent. This means that
dma_alloc_coherent will now use alloc_pages_node to allocate memory local to
the node that the PCI device is connected to.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit a98a5d04f400ad112e59cadd739dbabf89417e60
tree 5eeb7f45c0090de40c7523e2b9dfd5e86b22169e
parent 751382dd5cb2702368d281a50b55c2d6c4e8fbfc
parent 7ac3db59fd4410405ce55e2a25c397aec440d8da
author Todd Poynor <tpoynor@mvista.com> Tue, 12 Jul 2005 03:34:39 +0100
committer Thomas Gleixner <tglx@mtd.linutronix.de> Wed, 13 Jul 2005 00:58:44 +0200
Merge with rsync://fileserver/linux
commit 08357f82d4decc48bbfd39ae30d5fe0754f7f576
tree c8516a8f208e1cb253bd33f41857b0699104b130
parent 60a762b6a6dec17cc4339b60154902fd04c2f9f2
author Zoltan Menyhart <Zoltan.Menyhart@bull.net> Fri, 03 Jun 2005 05:36:00 -0700
committer Tony Luck <tony.luck@intel.com> Tue, 12 Jul 2005 15:33:18 -0700
[IA64] improve flush_icache_range()
Check with PAL to see what the i-cache line size is for
each level of the cache, and so use the correct stride
when flushing the cache.
Acked-by: David Mosberger
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 751382dd5cb2702368d281a50b55c2d6c4e8fbfc
tree 1d9195fe0bf264668b92fe2b2c36a4d76d253162
parent b62205986a73a40e4fc174d2ef668e3895e925bc
author Todd Poynor <tpoynor@mvista.com> Tue, 12 Jul 2005 03:34:39 +0100
committer Thomas Gleixner <tglx@mtd.linutronix.de> Wed, 13 Jul 2005 00:03:19 +0200
[JFFS2] Avoid compiler warnings when JFFS2_FS_WRITEBUFFER=n
Signed-off-by: Todd Poynor <tpoynor@mvista.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit b62205986a73a40e4fc174d2ef668e3895e925bc
tree e5754d64dcdf508dd4f3602135c963990d261411
parent e4fef6618992bea48b7856ebbd236796b744964f
author Artem B. Bityuckiy <dedekind@infradead.org> Tue, 12 Jul 2005 17:37:12 +0100
committer Thomas Gleixner <tglx@mtd.linutronix.de> Wed, 13 Jul 2005 00:02:33 +0200
[JFFS2] Init locks early during mount
In case of a mount error locks might be uninitialized but
accessed by the resulting call to jffs2_kill_sb().
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit e4fef6618992bea48b7856ebbd236796b744964f
tree fd0f89f0a1f5c955aec128843bc0663b326ff830
parent 86ffc0d5f5f0c8a6fe70eccade3f7ae8e9630edf
author Artem B. Bityuckiy <dedekind@infradead.org> Sun, 10 Jul 2005 16:15:36 +0100
committer Thomas Gleixner <tglx@mtd.linutronix.de> Tue, 12 Jul 2005 23:58:26 +0200
[JFFS2] Rename function and update comments
We recently changed the method of collecting and sorting of
tmp_dnode objects to use a temporary RB-tree instead of a
temporary list. Rename function and update comments.
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 86ffc0d5f5f0c8a6fe70eccade3f7ae8e9630edf
tree bef3020557487dd8755ca0d7b93aa46e0ddbf11a
parent 336d2ff7115bd4391108a16f476c739cb4a505b0
author Artem B. Bityuckiy <dedekind@infradead.org> Sun, 10 Jul 2005 14:13:58 +0100
committer Thomas Gleixner <tglx@mtd.linutronix.de> Tue, 12 Jul 2005 23:56:40 +0200
[JFFS2] Remove needless variable initialization
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 336d2ff7115bd4391108a16f476c739cb4a505b0
tree ac5dbf60deb2b97ec3cc0f0278da24efecacef21
parent 1ca70351af02b1f0eb9cd2e7eb7a547f8ad5d893
author Artem B. Bityuckiy <dedekind@infradead.org> Thu, 07 Jul 2005 16:45:32 +0100
committer Thomas Gleixner <tglx@mtd.linutronix.de> Tue, 12 Jul 2005 23:55:05 +0200
[JFFS2] Avoid alloc/dealloc for zero sized nodes
Signed-off-by: Artem B. Bityuckiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 60a762b6a6dec17cc4339b60154902fd04c2f9f2
tree d01918a446ad451a1ff5226f04e1747a6e48eb85
parent 514604c6d1779c55d3e97dc4e9a71c117c1ccbcd
author Greg Edwards <edwardsg@sgi.com> Tue, 28 Jun 2005 11:13:00 -0700
committer Tony Luck <tony.luck@intel.com> Tue, 12 Jul 2005 14:13:08 -0700
[IA64] remove CONFIG_IA64_SGI_SN_SIM
This patch removes the CONFIG_IA64_SGI_SN_SIM option entirely, allowing
any kernel bootable on sn2 to also be booted in the simulator.
Boot tested on Altix and HP rx2600.
Signed-off-by: Greg Edwards <edwardsg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 514604c6d1779c55d3e97dc4e9a71c117c1ccbcd
tree 19241b4db64f1da60c0dd594606c5d5fba8b254f
parent 1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6
author Christoph Lameter <clameter@sgi.com> Thu, 07 Jul 2005 16:59:00 -0700
committer Tony Luck <tony.luck@intel.com> Tue, 12 Jul 2005 11:04:22 -0700
[IA64] pcibus_to_node implementation for IA64
pcibus_to_node provides a way for the Linux kernel to identify to which
node a certain pcibus connects to. Allocations of control structures
for devices can then be made on the node where the pci bus is located
to allow local access during interrupt and other device manipulation.
This patch provides a new "node" field in the the pci_controller
structure. The node field will be set based on ACPI information (thanks
to Alex Williamson <alex.williamson@hp.com for that piece).
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 1ca70351af02b1f0eb9cd2e7eb7a547f8ad5d893
tree 2f00b49a065e1da68ea446b24c44a4b5bad1474e
parent 97f927a4d7dbccde0a854a62c3ea54d90bae8679
author Thomas Gleixner <tglx@tglx.tec.linutronix.de> Tue, 12 Jul 2005 17:51:06 +0200
committer Thomas Gleixner <tglx@mtd.linutronix.de> Tue, 12 Jul 2005 17:51:06 +0200
[MTD] Make XIP support depend on CONFIG_ARM
ARM is the only known user of this at the moment.
Prevent allyes builds for other archs from failing
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc
tree 79c81babb78c36f94f677ee587ab884903fffa12
parent e11b2236eace94ad9a2e421904742e83976405ed
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon, 11 Jul 2005 19:42:58 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon, 11 Jul 2005 19:42:58 +0100
[PATCH] ARM SMP: Initialise cpu_present_map
Rather than relying on the fixup code in init/main.c, explicitly
initialise cpu_present_map.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit e11b2236eace94ad9a2e421904742e83976405ed
tree d5882b4b06bf7a9310f993bf1935d720e6be9e7d
parent d12734d14e5602816f0b16b17a8cef5ea70afb5a
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon, 11 Jul 2005 19:26:31 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon, 11 Jul 2005 19:26:31 +0100
[PATCH] ARM SMP: We list IRQs for present CPUs, not online CPUs
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit d12734d14e5602816f0b16b17a8cef5ea70afb5a
tree cb6793f2bd1d5bbc53562c690e3e09351439e98a
parent 7343c9ba8ed9d504cd2daf960da58971c6631601
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon, 11 Jul 2005 17:38:36 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon, 11 Jul 2005 17:38:36 +0100
[PATCH] ARM SMP: Rename cpu_present_mask to cpu_possible_map
The kernel's terminology for this is cpu_possible_map not
cpu_present_mask.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7343c9ba8ed9d504cd2daf960da58971c6631601
tree 7f6b6b37f444f685bfbd82f0ce19305e600b660c
parent 5c23804a0941a111752fdacefe0bea2db1b4d93f
author Olaf Hering <olh@suse.de> Mon, 11 Jul 2005 10:17:06 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Mon, 11 Jul 2005 10:17:06 +0100
[PATCH] ARM: remove linux/version.h include from arch/arm
Changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 07929dcb963786512c760dd3ecd148d89295e7e5
tree f5db01392ebb968b4c8acb5a6b3b03a833bfcb02
parent c2d9b8387bce8b4a0fd402fab7dc1319d11a418d
parent 19f7241a3b087bbf4dd107c979608fdb56c83a09
author Anton Altaparmakov <aia21@cantab.net> Mon, 04 Jul 2005 14:14:42 +0100
committer Anton Altaparmakov <aia21@cantab.net> Mon, 04 Jul 2005 14:14:42 +0100
Automatic merge with /usr/src/ntfs-2.6.git.
commit c2d9b8387bce8b4a0fd402fab7dc1319d11a418d
tree 082cf7dd287f61635198011e61c3de1be130cc42
parent 2a322e4c08be4e7cb0c04b427ddaaa679fd88863
parent 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6
author Anton Altaparmakov <aia21@cantab.net> Thu, 30 Jun 2005 09:52:20 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 30 Jun 2005 09:52:20 +0100
Automerge with /usr/src/ntfs-2.6.git.
commit b38a3ab3d1bb0dc3288f73903d4dc4672b5cd2d0
tree 31d017dd1f9f4a8ca3e80d25d110c64ae82d4aae
parent f5f287738bddf38ec9ca79344f00dab675e1bbf5
author Dave Kleikamp <shaggy@austin.ibm.com> Mon, 27 Jun 2005 15:35:37 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Mon, 27 Jun 2005 15:35:37 -0500
JFS: Code cleanup - getting rid of never-used debug code
I'm finally getting around to cleaning out debug code that I've never used.
There has always been code ifdef'ed out by _JFS_DEBUG_DMAP, _JFS_DEBUG_IMAP,
_JFS_DEBUG_DTREE, and _JFS_DEBUG_XTREE, which I have personally never used,
and I doubt that anyone has since the design stage back in OS/2. There is
also a function, xtGather, that has never been used, and I don't know why it
was ever there.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 2a322e4c08be4e7cb0c04b427ddaaa679fd88863
tree ad8cc17bfd3b5e57e36f07a249028667d72f0b96
parent ba6d2377c85c9b8a793f455d8c9b6cf31985d70f
parent 8678887e7fb43cd6c9be6c9807b05e77848e0920
author Anton Altaparmakov <aia21@cantab.net> Sun, 26 Jun 2005 22:19:40 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sun, 26 Jun 2005 22:19:40 +0100
Automatic merge with /usr/src/ntfs-2.6.git.
commit ba6d2377c85c9b8a793f455d8c9b6cf31985d70f
tree 21e65c76db693869c84864af02e91c4b997a6ba5
parent af859a42d798f047fbfe198ed315a942662c39d2
author Anton Altaparmakov <aia21@cantab.net> Sun, 26 Jun 2005 22:12:02 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sun, 26 Jun 2005 22:12:02 +0100
NTFS: Fix a nasty deadlock that appeared in recent kernels.
The situation: VFS inode X on a mounted ntfs volume is dirty. For
same inode X, the ntfs_inode is dirty and thus corresponding on-disk
inode, i.e. mft record, which is in a dirty PAGE_CACHE_PAGE belonging
to the table of inodes, i.e. $MFT, inode 0.
What happens:
Process 1: sys_sync()/umount()/whatever... calls
__sync_single_inode() for $MFT -> do_writepages() -> write_page for
the dirty page containing the on-disk inode X, the page is now locked
-> ntfs_write_mst_block() which clears PageUptodate() on the page to
prevent anyone else getting hold of it whilst it does the write out.
This is necessary as the on-disk inode needs "fixups" applied before
the write to disk which are removed again after the write and
PageUptodate is then set again. It then analyses the page looking
for dirty on-disk inodes and when it finds one it calls
ntfs_may_write_mft_record() to see if it is safe to write this
on-disk inode. This then calls ilookup5() to check if the
corresponding VFS inode is in icache(). This in turn calls ifind()
which waits on the inode lock via wait_on_inode whilst holding the
global inode_lock.
Process 2: pdflush results in a call to __sync_single_inode for the
same VFS inode X on the ntfs volume. This locks the inode (I_LOCK)
then calls write-inode -> ntfs_write_inode -> map_mft_record() ->
read_cache_page() for the page (in page cache of table of inodes
$MFT, inode 0) containing the on-disk inode. This page has
PageUptodate() clear because of Process 1 (see above) so
read_cache_page() blocks when it tries to take the page lock for the
page so it can call ntfs_read_page().
Thus Process 1 is holding the page lock on the page containing the
on-disk inode X and it is waiting on the inode X to be unlocked in
ifind() so it can write the page out and then unlock the page.
And Process 2 is holding the inode lock on inode X and is waiting for
the page to be unlocked so it can call ntfs_readpage() or discover
that Process 1 set PageUptodate() again and use the page.
Thus we have a deadlock due to ifind() waiting on the inode lock.
The solution: The fix is to use the newly introduced
ilookup5_nowait() which does not wait on the inode's lock and hence
avoids the deadlock. This is safe as we do not care about the VFS
inode and only use the fact that it is in the VFS inode cache and the
fact that the vfs and ntfs inodes are one struct in memory to find
the ntfs inode in memory if present. Also, the ntfs inode has its
own locking so it does not matter if the vfs inode is locked.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit af859a42d798f047fbfe198ed315a942662c39d2
tree 6c892cbd43284e98cc879f0518dde8efc09740c7
parent 4757d7dff65b56f2115038ad1615725f31806787
author Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 21:07:27 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 21:07:27 +0100
NTFS: Prepare for 2.1.23 release: Update documentation and bump version.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 4757d7dff65b56f2115038ad1615725f31806787
tree b4a17ecec51c9b1175a22513699ae97c099c5d63
parent fa3be92317c4ae34edcf5274e8bbeff181e20b7a
author Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 17:24:08 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 17:24:08 +0100
NTFS: Change ntfs_map_runlist_nolock() to only decompress the mapping pairs
if the requested vcn is inside it. Otherwise we get into problems
when we try to map an out of bounds vcn because we then try to map
the already mapped runlist fragment which causes
ntfs_mapping_pairs_decompress() to fail and return error. Update
ntfs_attr_find_vcn_nolock() accordingly.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit fa3be92317c4ae34edcf5274e8bbeff181e20b7a
tree 84ae4ace6c891aa95b804950283e1f8f3e46c730
parent 1d58b27b8d77ecb816cfa8f846b78c845675eb89
author Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 17:15:36 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 17:15:36 +0100
NTFS: Add an extra parameter @last_vcn to ntfs_get_size_for_mapping_pairs()
and ntfs_mapping_pairs_build() to allow the runlist encoding to be
partial which is desirable when filling holes in sparse attributes.
Update all callers.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 1d58b27b8d77ecb816cfa8f846b78c845675eb89
tree 7c10e4182f87d00511aeb1d0583e3c09eeb807de
parent 3bd1f4a173a3445f9919c21e775de2d8b9deacf8
author Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 17:04:55 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 17:04:55 +0100
NTFS: Change the runlist terminator of the newly allocated cluster(s) to
LCN_ENOENT in ntfs_attr_make_non_resident(). Otherwise the runlist
code gets confused.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 3bd1f4a173a3445f9919c21e775de2d8b9deacf8
tree 6b32056b5b63d41fc5d032318ed0f94dbc562288
parent ca8fd7a0c6aa835e8014830b290cb965e85ac88e
author Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 16:51:58 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 16:51:58 +0100
NTFS: Fix several occurences of a bug where we would perform 'var & ~const'
with a 64-bit variable and a int, i.e. 32-bit, constant. This causes
the higher order 32-bits of the 64-bit variable to be zeroed. To fix
this cast the 'const' to the same 64-bit type as 'var'.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit ca8fd7a0c6aa835e8014830b290cb965e85ac88e
tree 504929d2a4beacb86fbc420c85f5c102f2a27fed
parent 9f993fe4634b39ca4404ba278053b03f360ec08a
author Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 16:31:27 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 16:31:27 +0100
NTFS: Detect the case when Windows has been suspended to disk on the volume
to be mounted and if this is the case do not allow (re)mounting
read-write. This is done by parsing hiberfil.sys if present.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 9f993fe4634b39ca4404ba278053b03f360ec08a
tree 36e62a3d384fa9c313cacd73b7aea086d7f74e82
parent 3f2faef00c6af17542ea8672ed7d09367222b2d0
author Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 16:15:36 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 16:15:36 +0100
NTFS: Fix a bug in address space operations error recovery code paths where
if the runlist was not mapped at all and a mapping error occured we
would leave the runlist locked on exit to the function so that the
next access to the same file would try to take the lock and deadlock.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 3f2faef00c6af17542ea8672ed7d09367222b2d0
tree 8b5cf2d76f2af684988d79b04e21ae92aaea8711
parent 38b22b6e9f46ab8f73ef5734f0e0a000766a9258
author Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 15:28:56 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 15:28:56 +0100
NTFS: Stamp the transaction log ($UsnJrnl), aka user space journal, if it
is active on the volume and we are mounting read-write or remounting
from read-only to read-write.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 38b22b6e9f46ab8f73ef5734f0e0a000766a9258
tree 2ccc41ef55918d3af43e444bde7648562a031559
parent 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4
parent b3e112bcc19abd8e9657dca34a87316786e096f3
author Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 14:27:27 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sat, 25 Jun 2005 14:27:27 +0100
Automerge with /usr/src/ntfs-2.6.git.
commit f5f287738bddf38ec9ca79344f00dab675e1bbf5
tree c8144a3906f6904f7cf18c4520976c79a1e15b0a
parent a8ad86f2dc46356f87be1327dabc18bdbda32f50
author Sonny Rao <sonny@burdell.org> Thu, 23 Jun 2005 16:57:56 -0500
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 23 Jun 2005 16:57:56 -0500
JFS: performance patch
Basically, we saw a large amount of time spent in the
jfs_strfromUCS_le() function, mispredicting the branch inside the
loop, so I just added some unlikely modifiers to the if statements to
re-ordered the code. Again, these simple changes provided > 2 % on
spec-sfs, so please consider it for inclusion.
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
commit 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4
tree ceba46966a5a1112a05d257d8ecb25ae5eee95e0
parent 364f6c717deef4a3ac4982e670fa9846b43cd060
parent ee98689be1b054897ff17655008c3048fe88be94
author Anton Altaparmakov <aia21@cantab.net> Thu, 23 Jun 2005 11:26:22 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 23 Jun 2005 11:26:22 +0100
Automatic merge with /usr/src/ntfs-2.6.git.
commit 364f6c717deef4a3ac4982e670fa9846b43cd060
tree 47e3967d6e2220130f2c070e300c97709143b28f
parent 4ff4258a3e558814a3d48c50a59cd22f56bbea2f
parent 1d6757fbff5bc86e94e59ab0d7bdd7e71351d839
author Anton Altaparmakov <aia21@cantab.net> Wed, 08 Jun 2005 15:45:45 +0100
committer Anton Altaparmakov <aia21@cantab.net> Wed, 08 Jun 2005 15:45:45 +0100
Automatic merge with /usr/src/ntfs-2.6.git
commit 4ff4258a3e558814a3d48c50a59cd22f56bbea2f
tree 35ac4a5d2b162687eef0c38aecf14f3a7c5afee0
parent 442d207eb0b4e7047c4fedccd900c425e689d502
parent 5e485b7975472ba4a408523deb6541e70c451842
author Anton Altaparmakov <aia21@cantab.net> Mon, 30 May 2005 21:34:37 +0100
committer Anton Altaparmakov <aia21@cantab.net> Mon, 30 May 2005 21:34:37 +0100
Automatic merge with /usr/src/ntfs-2.6.git.
commit 442d207eb0b4e7047c4fedccd900c425e689d502
tree 2c23dc98fba6912417164ba65b258a9da1241ae1
parent 2fb21db2548fc8b196eb8d8425f05ee1965d5344
author Anton Altaparmakov <aia21@cantab.net> Fri, 27 May 2005 16:42:56 +0100
committer Anton Altaparmakov <aia21@cantab.net> Fri, 27 May 2005 16:42:56 +0100
NTFS: Use C99 style structure initialization after memory allocation where
possible (fs/ntfs/{attrib.c,index.c,super.c}). Thanks to Al Viro and
Pekka Enberg.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 2fb21db2548fc8b196eb8d8425f05ee1965d5344
tree b319e97bfb3e50bcde9a82cf089d86a7dcb03df5
parent 5eac51462f340b7c4a03b9220cf157c40b4990a5
author Pekka Enberg <penberg@cs.helsinki.fi> Wed, 25 May 2005 21:15:34 +0300
committer Anton Altaparmakov <aia21@cantab.net> Fri, 27 May 2005 16:00:53 +0100
NTFS: Remove spurious void pointer casts from fs/ntfs/.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 5eac51462f340b7c4a03b9220cf157c40b4990a5
tree 9b3ebf457ea5b1bc97aa29b1092e6e2236f18603
parent c1c58ada91cfe86f19d430282132434e620a1067
parent 4ec5240ec367a592834385893200dd4fb369354c
author Anton Altaparmakov <aia21@cantab.net> Fri, 27 May 2005 15:36:21 +0100
committer Anton Altaparmakov <aia21@cantab.net> Fri, 27 May 2005 15:36:21 +0100
Merge with /usr/src/ntfs-2.6.git.
commit c1c58ada91cfe86f19d430282132434e620a1067
tree cd12933040a65398e9779c3596f5109e37c206c3
parent 67394f8f069c2fdf90f3b6d851824c07815442af
parent 2a24ab628aa7b190be32f63dfb6d96f3fb61580a
author Anton Altaparmakov <aia21@cantab.net> Wed, 25 May 2005 09:38:26 +0100
committer Anton Altaparmakov <aia21@cantab.net> Wed, 25 May 2005 09:38:26 +0100
Merge with /usr/src/ntfs-2.6.git
commit 67394f8f069c2fdf90f3b6d851824c07815442af
tree 0c33e62d34dbaecea434ae9ece3cc0c56db8b1f7
parent 450cbfbbbd88876e3ccec1d277f613221ca82bb7
parent 9636273dae265b9354b861b373cd43cd76a6d0fe
author Anton Altaparmakov <aia21@cantab.net> Sat, 21 May 2005 22:00:02 +0100
committer Anton Altaparmakov <aia21@cantab.net> Sat, 21 May 2005 22:00:02 +0100
Merge with /usr/src/ntfs-2.6.git
commit 450cbfbbbd88876e3ccec1d277f613221ca82bb7
tree af0f1b4c706ba7e725cd4e877a8b7ecf021d76c2
parent d53ee3222459f347cb18985a845864bc81a44eaf
parent bfd4bda097f8758d28e632ff2035e25577f6b060
author Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 22:39:49 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 22:39:49 +0100
Merge with /usr/src/ntfs-2.6.git
commit d53ee3222459f347cb18985a845864bc81a44eaf
tree e9f8a061e958579a6de1d3ee133fd30ca4139f9c
parent 7fafb8b634121f4fa35ff92f85737f8bc2259f06
author Anton Altaparmakov <aia21@cantab.net> Wed, 06 Apr 2005 16:11:20 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:49:42 +0100
NTFS: Use MAX_BUF_PER_PAGE instead of variable sized array allocation for
better code generation and one less sparse warning in fs/ntfs/aops.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 7fafb8b634121f4fa35ff92f85737f8bc2259f06
tree ed581b567781b6b2a99a9f2059e3f3c324a0c928
parent bb3cf33509009132cf8c7a7729f9d26c0c5fa961
author Anton Altaparmakov <aia21@cantab.net> Wed, 06 Apr 2005 16:09:21 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:48:00 +0100
NTFS: Minor cleanup: Define and use NTFS_MAX_CLUSTER_SIZE constant instead
of hard coded 0x10000 in fs/ntfs/super.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit bb3cf33509009132cf8c7a7729f9d26c0c5fa961
tree 1e5a6a8bdf12e158a792b26b1d24b1743ce8a975
parent b0d2374d62faed034dd80e6524efb98a6341597c
author Anton Altaparmakov <aia21@cantab.net> Wed, 06 Apr 2005 13:34:31 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:46:17 +0100
NTFS: Update attribute definition handling.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit b0d2374d62faed034dd80e6524efb98a6341597c
tree 99ae91efcc90ead7b8aa1cc44f286a528adc6545
parent 251c8427c9c418674fc3c04a11de95dc3661b560
author Anton Altaparmakov <aia21@cantab.net> Mon, 04 Apr 2005 16:20:14 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:44:41 +0100
NTFS: Some utilities modify the boot sector but do not update the checksum.
Thus, relax the checking in fs/ntfs/super.c::is_boot_sector_ntfs() to
only emit a warning when the checksum is incorrect rather than
refusing the mount. Thanks to Bernd Casimir for pointing this
problem out.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 251c8427c9c418674fc3c04a11de95dc3661b560
tree b67bab32762a4a64083de64281b1249bccfd9402
parent 53d59aad9326199ef5749c97513db498309a057e
author Jesper Juhl <juhl-lkml@dif.dk> Mon, 04 Apr 2005 14:59:56 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:42:27 +0100
NTFS: Remove checks for NULL before calling kfree() since kfree() does the
checking itself. (Jesper Juhl)
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 53d59aad9326199ef5749c97513db498309a057e
tree 3fc3e99673cf5c5c8f275cca1ec7ed2dfe5fa192
parent 1ef334d372d6a7006e20f56f7e85d8f4ec32e3c2
author Anton Altaparmakov <aia21@cantab.net> Thu, 17 Mar 2005 10:51:33 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:39:30 +0100
NTFS: Fix compilation when configured read-only.
- Add ifdef NTFS_RW around write specific code if fs/ntfs/runlist.[hc] and
fs/ntfs/attrib.[hc].
- Minor bugfix to fs/ntfs/attrib.c::ntfs_attr_make_non_resident() where the
runlist was not freed in all error cases.
- Add fs/ntfs/runlist.[hc]::ntfs_rl_find_vcn_nolock().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 1ef334d372d6a7006e20f56f7e85d8f4ec32e3c2
tree 5b03ef9048fec32ebd7b1d75686b1dc73599c661
parent 905685f68fc72844b8c2689c39a5c6c35e840152
author Anton Altaparmakov <aia21@cantab.net> Mon, 04 Apr 2005 14:59:42 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:27:45 +0100
NTFS: Include linux/swap.h in fs/ntfs/attrib.c for mark_page_accessed().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 905685f68fc72844b8c2689c39a5c6c35e840152
tree 0ff1d145a7771b24643c1b685ecbb3f791cda6fb
parent 43b01fda8b17b2b63e7dcdeed11c2ebba56b1fc9
author Anton Altaparmakov <aia21@cantab.net> Thu, 10 Mar 2005 11:06:19 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:26:01 +0100
NTFS: - Modify ->readpage and ->writepage (fs/ntfs/aops.c) so they detect
and handle the case where an attribute is converted from resident
to non-resident by a concurrent file write.
- Reorder some operations when converting an attribute from resident
to non-resident (fs/ntfs/attrib.c) so it is safe wrt concurrent
->readpage and ->writepage.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 43b01fda8b17b2b63e7dcdeed11c2ebba56b1fc9
tree fd925e409efa2787469689180afa78152947c4a0
parent 2bfb4fff3e9731ecfe745881e53cfb2e646c47bb
author Anton Altaparmakov <aia21@cantab.net> Wed, 09 Mar 2005 15:18:43 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:23:20 +0100
NTFS: Fix sign of various error return values to be negative in
fs/ntfs/lcnalloc.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 2bfb4fff3e9731ecfe745881e53cfb2e646c47bb
tree a607df8a7d0532803584dab19bf13b69acbb668d
parent c0c1cc0e46b36347f11b566f99087dc5e6fc1b89
author Anton Altaparmakov <aia21@cantab.net> Wed, 09 Mar 2005 15:15:06 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:22:07 +0100
NTFS: Add fs/ntfs/attrib.[hc]::ntfs_attr_make_non_resident().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit c0c1cc0e46b36347f11b566f99087dc5e6fc1b89
tree 773105bdde7454d10dccc127048a9847f7e01f11
parent 271849a98849394ea85fa7caa8a1aaa2b3a849b7
author Anton Altaparmakov <aia21@cantab.net> Mon, 07 Mar 2005 21:43:38 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:20:49 +0100
NTFS: - Fix bug in fs/ntfs/attrib.c::ntfs_find_vcn_nolock() where after
dropping the read lock and taking the write lock we were not checking
whether someone else did not already do the work we wanted to do.
- Rename ntfs_find_vcn_nolock() to ntfs_attr_find_vcn_nolock().
- Tidy up some comments in fs/ntfs/runlist.c.
- Add LCN_ENOMEM and LCN_EIO definitions to fs/ntfs/runlist.h.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 271849a98849394ea85fa7caa8a1aaa2b3a849b7
tree 08e932656e463845faaa3610059c67e16aa92b7d
parent 7e693073a940c7484c0c21e3e1603e29ce46f30c
author Anton Altaparmakov <aia21@cantab.net> Mon, 07 Mar 2005 21:36:18 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:18:43 +0100
NTFS: Add fs/ntfs/attrib.[hc]::ntfs_attr_vcn_to_lcn_nolock() used by the new
write code.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 7e693073a940c7484c0c21e3e1603e29ce46f30c
tree 865f7c9374fd2c4f072c17b97aff2225bfc06a75
parent 9451f8519c5e6d5d064c30033fc3d4ce77de321c
author Anton Altaparmakov <aia21@cantab.net> Thu, 03 Mar 2005 16:38:59 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:17:08 +0100
NTFS: Add AT_EA in addition to AT_DATA to whitelist for being allowed to be
non-resident in fs/ntfs/attrib.c::ntfs_attr_can_be_non_resident().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 9451f8519c5e6d5d064c30033fc3d4ce77de321c
tree 104eedf065c4091838a27f6e674875a035c30820
parent 413826868fb49d200b741bcaeaf58ea5c5e45321
author Anton Altaparmakov <aia21@cantab.net> Thu, 03 Mar 2005 14:43:43 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:15:46 +0100
NTFS: Correct sparse file handling. The compressed values need to be
checked and set in the ntfs inode as done for compressed files
and the compressed size needs to be used for vfs inode->i_blocks
instead of the allocated size, again, as done for compressed files.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 413826868fb49d200b741bcaeaf58ea5c5e45321
tree a106b6e0bae52a68a0b824f1999ab694d894a1f2
parent 8907547d4b099e67762ea4891c127ea1f6dd1cb7
author Anton Altaparmakov <aia21@cantab.net> Thu, 03 Mar 2005 13:44:15 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:13:56 +0100
NTFS: Make fs/ntfs/namei.c::ntfs_get_{parent,dentry} static and move the
definition of ntfs_export_ops from fs/ntfs/super.c to namei.c.
Also, declare ntfs_export_ops in fs/ntfs/ntfs.h.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 8907547d4b099e67762ea4891c127ea1f6dd1cb7
tree 74fa9c887db8a7915325ad9a76d874ed134c0d9a
parent 5ae9fcf8f329baba4bada8719cb0337eef083a1a
author Randy Dunlap <rddunlap@osdl.org> Thu, 03 Mar 2005 11:19:53 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:11:47 +0100
NTFS: Fix printk format warnings on ia64. (Randy Dunlap)
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 5ae9fcf8f329baba4bada8719cb0337eef083a1a
tree 28f268908b5bd780a114825879d7bc35d98d9dca
parent 37e4c13b987a7923ec13bda7368901b3e094fecb
author Anton Altaparmakov <aia21@cantab.net> Wed, 02 Mar 2005 17:03:24 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:04:54 +0100
NTFS: - Set the ntfs_inode->allocated_size to the real allocated size in the
mft record for resident attributes (fs/ntfs/inode.c).
- Small readability cleanup to use "a" instead of "ctx->attr"
everywhere (fs/ntfs/inode.c).
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 37e4c13b987a7923ec13bda7368901b3e094fecb
tree 781dcc0990fc42c26492206261d4b5f325715821
parent d8ec785e0bf2941ed546711c2f240a3e030c39c7
author Anton Altaparmakov <aia21@cantab.net> Fri, 18 Feb 2005 10:03:13 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:03:01 +0100
NTFS: Fix a nasty runlist merge bug when merging two holes.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit d8ec785e0bf2941ed546711c2f240a3e030c39c7
tree c4b69ce75a331731d9616fa9868cceba4e90325e
parent b6ad6c52fe36ab35d0fe28c064f59de2ba670c2a
author Anton Altaparmakov <aia21@cantab.net> Fri, 18 Feb 2005 09:23:39 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 11:01:13 +0100
NTFS: Change time to u64 in time.h::ntfs2utc() as it otherwise generates a
warning in the do_div() call on sparc32. Thanks to Meelis Roos for the
report and analysis of the warning.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit b6ad6c52fe36ab35d0fe28c064f59de2ba670c2a
tree d888c28a2c3c7fa733045dc7dc9c9bc7f157bf4a
parent 1a0df15acdae065789446aca83021c72b71db9a5
author Anton Altaparmakov <aia21@cantab.net> Tue, 15 Feb 2005 10:08:43 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:56:31 +0100
NTFS: - Split ntfs_map_runlist() into ntfs_map_runlist() and a non-locking
helper ntfs_map_runlist_nolock() which is used by ntfs_map_runlist().
This allows us to map runlist fragments with the runlist lock already
held without having to drop and reacquire it around the call. Adapt
all callers.
- Change ntfs_find_vcn() to ntfs_find_vcn_nolock() which takes a locked
runlist. This allows us to find runlist elements with the runlist
lock already held without having to drop and reacquire it around the
call. Adapt all callers.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 1a0df15acdae065789446aca83021c72b71db9a5
tree bb3bf97da4f2753aba46e1dd4855c0ef9f7c55b8
parent c002f42543e155dd2b5b5039ea2637ab26c82513
author Anton Altaparmakov <aia21@cantab.net> Thu, 03 Feb 2005 12:04:36 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:54:37 +0100
NTFS: Fix a bug in fs/ntfs/runlist.c::ntfs_mapping_pairs_decompress() in
the creation of the unmapped runlist element for the base attribute
extent.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit c002f42543e155dd2b5b5039ea2637ab26c82513
tree ea408493d2e0e9096166ab39a8657689c15c7dfa
parent f40661be038ce6ed9ef6a8b80307a9153bd95769
author Anton Altaparmakov <aia21@cantab.net> Thu, 03 Feb 2005 12:02:56 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:53:01 +0100
NTFS: - Add disable_sparse mount option together with a per volume sparse
enable bit which is set appropriately and a per inode sparse disable
bit which is preset on some system file inodes as appropriate.
- Enforce that sparse support is disabled on NTFS volumes pre 3.0.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit f40661be038ce6ed9ef6a8b80307a9153bd95769
tree 61c9c81643c96ffa7cdb186b10e5e2f141493b56
parent 946929d813a3bde095678526dd037ab9ac6efe35
author Anton Altaparmakov <aia21@cantab.net> Thu, 13 Jan 2005 16:03:38 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:48:11 +0100
NTFS: Optimise/reorganise some error handling code in fs/ntfs/aops.c.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 946929d813a3bde095678526dd037ab9ac6efe35
tree eb2601dc94364d9d376be372ccaadb304c921653
parent 3834c3f227725e2395840aed82342bda4ee9d379
author Anton Altaparmakov <aia21@cantab.net> Thu, 13 Jan 2005 15:26:29 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:47:05 +0100
NTFS: Fixup the resident attribute resizing code in
fs/ntfs/aops.c::ntfs_{prepare,commit}_write()() and re-enable it.
It should be safe now. (Famous last words...)
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 3834c3f227725e2395840aed82342bda4ee9d379
tree 7a145a78efc44cb5ddce614cdd2618c710c8e3b7
parent 149f0c5200188a43f1fc11ca2fb14d8183013d10
author Anton Altaparmakov <aia21@cantab.net> Thu, 13 Jan 2005 11:04:39 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:45:36 +0100
NTFS: Fix stupid bug in fs/ntfs/mft.c introduced in last changeset.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 149f0c5200188a43f1fc11ca2fb14d8183013d10
tree 6fed760d28b70790e26803f6f18a663eb487764c
parent 07a4e2da7dd3c9345f84b2552872f9d38c257451
author Anton Altaparmakov <aia21@cantab.net> Wed, 12 Jan 2005 13:52:30 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:43:29 +0100
NTFS: Repeat a failed ntfs_truncate() in fs/ntfs/aops.c::ntfs_writepage()
and abort if it fails again.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 07a4e2da7dd3c9345f84b2552872f9d38c257451
tree 8fbd4c3e11196752ae8ff7944ccb26b93cafbb1c
parent f50f3ac51983025405a71b70b033cc6bcb0d1fc1
author Anton Altaparmakov <aia21@cantab.net> Wed, 12 Jan 2005 13:08:26 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:39:08 +0100
NTFS: Use i_size_{read,write}() in fs/ntfs/{aops.c,mft.c} and protect
access to the i_size and other size fields using the size_lock.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit f50f3ac51983025405a71b70b033cc6bcb0d1fc1
tree 98c9e85271354a878237d77c30a144680cbc1bb1
parent 218357ff1b1b2f1bfdce89d608dbe33dd2f9f14b
author Anton Altaparmakov <aia21@cantab.net> Fri, 19 Nov 2004 22:16:00 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:37:22 +0100
NTFS: Use i_size_read() in fs/ntfs/inode.c once and then use the cached value
afterwards when reading the size of the bitmap inode.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 218357ff1b1b2f1bfdce89d608dbe33dd2f9f14b
tree b7621daec3c516507fed85a25e9e82198589f216
parent 206f9f35b2348b7b966ff18a5564b8a3ca325ed5
author Anton Altaparmakov <aia21@cantab.net> Thu, 18 Nov 2004 20:34:59 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:34:45 +0100
NTFS: - Use i_size_read() in fs/ntfs/super.c once and then use the cached
value afterwards. Cache the initialized_size in the same way and
protect access to the two sizes using the size_lock.
- Minor optimization to fs/ntfs/super.c::ntfs_statfs() and its helpers.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 206f9f35b2348b7b966ff18a5564b8a3ca325ed5
tree 2f221334cf8b1b9756a58e323b5fba2cdd4dc583
parent 367636772f094fd840d2d79e75257bcfaa28e70f
author Anton Altaparmakov <aia21@cantab.net> Thu, 18 Nov 2004 15:01:06 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:32:43 +0100
NTFS: In fs/ntfs/dir.c, use i_size_read() once and then the cached value
afterwards.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 367636772f094fd840d2d79e75257bcfaa28e70f
tree a8d8f3154eea80710a8cad2b7de082046aa012f0
parent 899101aebb9ab3692aa8efe2805174ee0ee3edb5
author Anton Altaparmakov <aia21@cantab.net> Thu, 18 Nov 2004 13:46:45 +0000
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:30:29 +0100
NTFS: - In fs/ntfs/compress.c, use i_size_read() at the start and then use the
cached value everywhere. Cache the initialized_size in the same way
and protect the critical region where the two sizes are read using the
new size_lock of the ntfs inode.
- Add the new size_lock to the ntfs_inode structure (fs/ntfs/inode.h)
and initialize it (fs/ntfs/inode.c).
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 899101aebb9ab3692aa8efe2805174ee0ee3edb5
tree eee4728a7d82c6a33409313b561296eb66d984ef
parent 36050271e6ec19390184e1a83470eb7e725cad65
parent 897f5ab2cd733a77a2279268262919caa8154b9d
author Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:15:25 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 10:15:25 +0100
Merge with /usr/src/ntfs-2.6.git
commit 36050271e6ec19390184e1a83470eb7e725cad65
tree ef2c84331d71890e9a68eb63d925d5545cbb4103
parent d4b9ba7bf6f38cff55b5d95a0db7dd91311ce20a
parent 1d42a0ecf478962e8aede355a0be41365c117ff0
author Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 00:08:35 +0100
committer Anton Altaparmakov <aia21@cantab.net> Thu, 05 May 2005 00:08:35 +0100
Merge with /usr/src/ntfs-2.6.git
commit d4b9ba7bf6f38cff55b5d95a0db7dd91311ce20a
tree b86c83f8c04e159bb8f806990cbf61e88ceebf30
parent db30d160cd8dfe1e53435fd76f4189778f1c728e
author Anton Altaparmakov <aia21@cantab.net> Wed, 17 Nov 2004 15:45:08 +0000
committer Anton Altaparmakov <aia21@cantab.net> Wed, 04 May 2005 17:02:25 +0100
NTFS: Use i_size_read() in fs/ntfs/file.c::ntfs_file_open().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit db30d160cd8dfe1e53435fd76f4189778f1c728e
tree add695bfe2311c653143b08fa717ad909bf48f5c
parent 66129f88c4cc719591f687e5c8c764fe9d3e437a
author Anton Altaparmakov <aia21@cantab.net> Thu, 11 Nov 2004 12:42:00 +0000
committer Anton Altaparmakov <aia21@cantab.net> Wed, 04 May 2005 17:00:18 +0100
NTFS: Use i_size_read() once and then use the cached value in
fs/ntfs/lcnalloc.c::ntfs_cluster_alloc().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit 66129f88c4cc719591f687e5c8c764fe9d3e437a
tree 3fc9f181a1666eff445bdb6a243dd4e080c233f9
parent da28438cae9a271c5c232177f81dfb243de9b7fa
author Anton Altaparmakov <aia21@cantab.net> Thu, 11 Nov 2004 12:34:00 +0000
committer Anton Altaparmakov <aia21@cantab.net> Wed, 04 May 2005 16:57:47 +0100
NTFS: Use i_size_read() in fs/ntfs/logfile.c::ntfs_{check,empty}_logfile().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
commit da28438cae9a271c5c232177f81dfb243de9b7fa
tree 40817e52c229dbb288f6425b2056c1ad61ad6470
parent 8800cea62025a5209d110c5fa5990429239d6eee
author Anton Altaparmakov <aia21@cantab.net> Thu, 11 Nov 2004 11:18:10 +0000
committer Anton Altaparmakov <aia21@cantab.net> Wed, 04 May 2005 14:24:16 +0100
NTFS: Use i_size_read() in fs/ntfs/attrib.c::ntfs_attr_set().
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>