aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'for_linus' of ↵Linus Torvalds2009-04-03
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: udf: Don't write integrity descriptor too often udf: Try anchor in block 256 first udf: Some type fixes and cleanups udf: use hardware sector size udf: fix novrs mount option udf: Fix oops when invalid character in filename occurs udf: return f_fsid for statfs(2) udf: Add checks to not underflow sector_t udf: fix default mode and dmode options handling udf: fix sparse warnings: udf: unsigned last[i] cannot be less than 0 udf: implement mode and dmode mounting options udf: reduce stack usage of udf_get_filename udf: reduce stack usage of udf_load_pvoldesc Fix the udf code not to pass structs on stack where possible. Remove struct typedefs from fs/udf/ecma_167.h et al.
| * udf: Don't write integrity descriptor too oftenJan Kara2009-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We update information in logical volume integrity descriptor after each allocation (as LVID contains free space, number of directories and files on disk etc.). If the filesystem is on some phase change media, this leads to its quick degradation as such media is able to handle only 10000 overwrites or so. We solve the problem by writing new information into LVID only on umount, remount-ro and sync. This solves the problem at the price of longer media inconsistency (previously media became consistent after pdflush flushed dirty LVID buffer) but that should be acceptable. Report by and patch written in cooperation with Rich Coe <Richard.Coe@med.ge.com>. Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: Try anchor in block 256 firstJan Kara2009-04-02
| | | | | | | | | | | | | | | | | | | | | | | | Anchor block can be located at several places on the medium. Two of the locations are relative to media end which is problematic to detect. Also some drives report some block as last but are not able to read it or any block nearby before it. So let's first try block 256 and if it is all fine, don't look at other possible locations of anchor blocks to avoid IO errors. This change required a larger reorganization of code but the new code is hopefully more readable and definitely shorter. Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: Some type fixes and cleanupsJan Kara2009-04-02
| | | | | | | | | | | | | | | | Make udf_check_valid() return 1 if the validity check passed and 0 otherwise. So far it was the other way around which was a bit confusing. Also make udf_vrs() return loff_t which is really the type it should return (not int). Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: use hardware sector sizeClemens Ladisch2009-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the UDF FS driver use the hardware sector size as the default logical block size, which is required by the UDF specifications. While the previous default of 2048 bytes was correct for optical disks, it was not for hard disks or USB storage devices, and made it impossible to use such a device with the default mount options. (The Linux mkudffs tool uses a default block size of 2048 bytes even on devices with smaller hardware sectors, so this bug is unlikely to be noticed unless UDF-formatted USB storage devices are exchanged with other OSs.) To avoid regressions for people who use loopback optical disk images or who used the (sometimes wrong) defaults of mkudffs, we also try with a block size of 2048 bytes if no anchor was found with the hardware sector size. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: fix novrs mount optionClemens Ladisch2009-04-02
| | | | | | | | | | | | | | The novrs mount option was broken due to a missing break. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: Fix oops when invalid character in filename occursJan Kara2009-04-02
| | | | | | | | | | | | | | | | | | Functions udf_CS0toNLS() and udf_NLStoCS0() didn't count with the fact that NLS can return negative length when invalid character is given to it for conversion. Thus interesting things could happen (such as overwriting random memory with the rest of filename). Add appropriate checks. Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: return f_fsid for statfs(2)Coly Li2009-04-02
| | | | | | | | | | | | | | | | This patch makes udf return f_fsid info for statfs(2). Signed-off-by: Coly Li <coly.li@suse.de> Cc: Jan Kara <jack@suse.cz> Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: Add checks to not underflow sector_tJan Kara2009-04-02
| | | | | | | | Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: fix default mode and dmode options handlingMarcin Slusarz2009-04-02
| | | | | | | | | | | | | | | | | | | | On x86 (and several other archs) mode_t is defined as "unsigned short" and comparing unsigned shorts to negative ints is broken (because short is promoted to int and then compared). Fix it. Reported-and-tested-by: Laurent Riffard <laurent.riffard@free.fr> Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: fix sparse warnings:Jan Kara2009-04-02
| | | | | | | | | | | | | | | | | | | | | | | | Fix sparse warnings: fs/udf/balloc.c:843:3: warning: returning void-valued expression fs/udf/balloc.c:847:3: warning: returning void-valued expression fs/udf/balloc.c:851:3: warning: returning void-valued expression fs/udf/balloc.c:855:3: warning: returning void-valued expression Reported-by: Hannes Eder <hannes@hanneseder.net> Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: unsigned last[i] cannot be less than 0roel kluin2009-04-02
| | | | | | | | | | | | | | unsigned last[i] cannot be less than 0 Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: implement mode and dmode mounting optionsMarcin Slusarz2009-04-02
| | | | | | | | | | | | | | | | | | "dmode" allows overriding permissions of directories and "mode" allows overriding permissions of files. Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: Jan Kara <jack@suse.cz> Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: reduce stack usage of udf_get_filenameMarcin Slusarz2009-04-02
| | | | | | | | | | | | | | | | | | | | | | | | Allocate strings with kmalloc. Checkstack output: Before: udf_get_filename: 600 After: udf_get_filename: 136 Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: Jan Kara <jack@suse.cz> Signed-off-by: Jan Kara <jack@suse.cz>
| * udf: reduce stack usage of udf_load_pvoldescMarcin Slusarz2009-04-02
| | | | | | | | | | | | | | | | | | | | | | Allocate strings with kmalloc. Checkstack output: Before: udf_process_sequence: 712 After: udf_process_sequence: 200 Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
| * Fix the udf code not to pass structs on stack where possible.Pekka Enberg2009-04-02
| | | | | | | | | | Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Jan Kara <jack@suse.cz>
| * Remove struct typedefs from fs/udf/ecma_167.h et al.Pekka Enberg2009-04-02
| | | | | | | | | | Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Jan Kara <jack@suse.cz>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/rcu-doc-2.6Linus Torvalds2009-04-03
|\ \ | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/davem/rcu-doc-2.6: Doc: Fix spelling in RCU/rculist_nulls.txt. Doc: Fix wrong API example usage of call_rcu(). Doc: Fix missing whitespaces in RCU documentation.
| * | Doc: Fix spelling in RCU/rculist_nulls.txt.Jesper Dangaard Brouer2009-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Fix spelling in RCU/rculist_nulls.txt. Trival spelling fixes in RCU/rculist_nulls.txt. Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk> Tested-by: Jarek Poplawski <jarkao2@gmail.com;-> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | Doc: Fix wrong API example usage of call_rcu().Jesper Dangaard Brouer2009-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some point the API of call_rcu() changed from three parameters to two parameters, correct the documentation. One confusing thing in RCU/listRCU.txt, which is NOT fixed in this patch, is that no reason or explaination is given for using call_rcu() instead of the normal synchronize_rcu() call. Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | Doc: Fix missing whitespaces in RCU documentation.Jesper Dangaard Brouer2009-04-02
| |/ | | | | | | | | | | | | | | | | Trivial fix while reading through the RCU docs. Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
* | mm: fix misuse of debug_kmap_atomicAkinobu Mita2009-04-03
| | | | | | | | | | | | | | | | Commit 7ca43e7564679604d86e9ed834e7bbcffd8a4a3f ("mm: use debug_kmap_atomic") introduced some debug_kmap_atomic() in wrong places. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Fix highmem PPC build failureKumar Gala2009-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f4112de6b679d84bd9b9681c7504be7bdfb7c7d5 ("mm: introduce debug_kmap_atomic") broke PPC builds with CONFIG_HIGHMEM=y: CC init/main.o In file included from include/linux/highmem.h:25, from include/linux/pagemap.h:11, from include/linux/mempolicy.h:63, from init/main.c:53: arch/powerpc/include/asm/highmem.h: In function 'kmap_atomic_prot': arch/powerpc/include/asm/highmem.h:98: error: implicit declaration of function 'debug_kmap_atomic' In file included from include/linux/pagemap.h:11, from include/linux/mempolicy.h:63, from init/main.c:53: include/linux/highmem.h: At top level: include/linux/highmem.h:196: warning: conflicting types for 'debug_kmap_atomic' include/linux/highmem.h:196: error: static declaration of 'debug_kmap_atomic' follows non-static declaration include/asm/highmem.h:98: error: previous implicit declaration of 'debug_kmap_atomic' was here make[1]: *** [init/main.o] Error 1 make: *** [init] Error 2 Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2009-04-03
|\ \ | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: ixp4xx - Fix handling of chained sg buffers crypto: shash - Fix unaligned calculation with short length hwrng: timeriomem - Use phys address rather than virt
| * | crypto: ixp4xx - Fix handling of chained sg buffersChristian Hohnstaedt2009-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - keep dma functions away from chained scatterlists. Use the existing scatterlist iteration inside the driver to call dma_map_single() for each chunk and avoid dma_map_sg(). Signed-off-by: Christian Hohnstaedt <chohnstaedt@innominate.com> Tested-By: Karl Hiramoto <karl@hiramoto.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * | crypto: shash - Fix unaligned calculation with short lengthYehuda Sadeh2009-03-27
| | | | | | | | | | | | | | | | | | | | | When the total length is shorter than the calculated number of unaligned bytes, the call to shash->update breaks. For example, calling crc32c on unaligned buffer with length of 1 can result in a system crash. Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| * | hwrng: timeriomem - Use phys address rather than virtAlexander Clouter2009-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no ioremap'ing or anything in timeriomem-rng.c as I foolishly used already remapped virtual addresses instead of passing the physical address to be polled. This patch fixes this flaw and lets developers do the Right Thing(tm). Signed-off-by: Alexander Clouter <alex@digriz.org.uk> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
* | | Merge branch 'for-linus' of ↵Linus Torvalds2009-04-03
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (41 commits) m68knommu: improve compile arch switch settings m68knommu: fix 5407 ColdFire UART vector setup m68knommu: fix 5307 ColdFire UART vector setup m68knommu: fix 5249 ColdFire UART vector setup m68knommu: fix 5249 ColdFire UART setup m68knommu: fix end of uart table marker m68knommu: switch to using generic_handle_irq() m68k: merge the mmu and non-mmu versions of tlbflush.h m68knommu: introduce basic clk infrastructure m68k: merge the mmu and non-mmu versions of module.h m68knommu: add missing interrupt line definition for UART 2 m68k: merge the mmu and non-mmu versions of mmu_context.h m68k: merge the mmu and non-mmu versions of current.h m68k: merge the mmu and non-mmu versions of div64.h m68k: merge the mmu and non-mmu versions of bugs.h m68k: merge the mmu and non-mmu versions of bug.h m68k: use the mmu version of cache.h for m68knommu as well m68k: use the mmu version of bootinfo.h for m68knommu as well m68k: merge the mmu and non-mmu versions of fb.h m68k: merge the mmu and non-mmu versions of segment.h ...
| * | | m68knommu: improve compile arch switch settingsGreg Ungerer2009-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Modern versions of gcc have a better range of ColdFire optimization switches for the vairous ColdFire family members. Use these when we can. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68knommu: fix 5407 ColdFire UART vector setupGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a couple of problems with the UART vector setup for the 5307 ColdFire UART. The ICR register access should be 8bit, not 32bit. The address of the UIVR register is wrong, it needs to be offset into the MBAR register region. Fix these. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68knommu: fix 5307 ColdFire UART vector setupGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a couple of problems with the UART vector setup for the 5307 ColdFire UART. The ICR register access should be 8bit, not 32bit. The address of the UIVR register is wrong, it needs to be offset into the MBAR register region. Fix these. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68knommu: fix 5249 ColdFire UART vector setupGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The address of the IVUR register is not correct, it should be offset into the MBAR region. Without this the vector is not set to the correct number. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68knommu: fix 5249 ColdFire UART setupGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The ICR registers of the 5249 ColdFire processor are 8bits, not 32bits. Fix the read/write of these register to be the correct size. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68knommu: fix end of uart table markerGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The UART platform data structure is missing an empty struct at the end (as the end of structure marker). Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68knommu: switch to using generic_handle_irq()Greg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | Switch to using generic_handle_irq() instead of the deprecated __do_IRQ(). Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68k: merge the mmu and non-mmu versions of tlbflush.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | Simple merge of the mmu and non-mmu versions of tlbflush.h Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68knommu: introduce basic clk infrastructureGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create basic support for clk API. Recent changes to the FEC driver (used by many ColdFire family parts) need this. Initially only supports getting the master clock frequency. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68k: merge the mmu and non-mmu versions of module.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | Simple merge of the mmu and non-mmu versions of module.h Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68knommu: add missing interrupt line definition for UART 2Greg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: David Wu <david.wu@arcturusnetworks.com> Acked-by: Michael Durrant <mdurrant@arcturusnetworks.com> Acked-by: Oleksandr Zhadan <oleks@arcturusnetworks.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68k: merge the mmu and non-mmu versions of mmu_context.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | Simple merge of the mmu and non-mmu versions of mmu_context.h Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| * | | m68k: merge the mmu and non-mmu versions of current.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of current.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | | m68k: merge the mmu and non-mmu versions of div64.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of div64.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | | m68k: merge the mmu and non-mmu versions of bugs.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of bugs.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | | m68k: merge the mmu and non-mmu versions of bug.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of bug.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | | m68k: use the mmu version of cache.h for m68knommu as wellGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The non-mmu version of cache.h is almost the same as the mmu version. Merge them. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | | m68k: use the mmu version of bootinfo.h for m68knommu as wellGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All m68k varients can use the same mmu version of bootinfo.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | | m68k: merge the mmu and non-mmu versions of fb.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu versions of fb.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | | m68k: merge the mmu and non-mmu versions of segment.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial merge of the mmu and non-mmu version of segment.h. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | | m68k: merge the mmu and non-mmu versions of ucontext.hGreg Ungerer2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The non-mmu m68k setups can use the mm ucontext.h with no change. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
| * | | m68knommu: Fix support for console port other than ttyS0 on mcf.cLen Sorensen2009-03-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a case of backwards logic, mfc.c always makes the console port be ttyS0 even when you ask for another port. This patch fixes this issue. Only when the requested port is NOT in the range 0 to MAXPORTS-1 do we force it to be treated as if port 0 was requested. Forcing the port to 0 when it is in fact in the range 0 to MAXPORTS is not helpful. Tested with working console on ttyS2 on a 5271evb. Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca> Signed-off-by: Greg Ungerer <gerg@uclinux.org>