1. 09 Apr, 2006 27 commits
  2. 02 Apr, 2006 13 commits
    • Linus Torvalds's avatar
      Linux v2.6.17-rc1 · 6246b612
      Linus Torvalds authored
      Close of the merge window..
      6246b612
    • Linus Torvalds's avatar
      Update dummy snd_power_wait() function for new calling convention · 6fdb94bd
      Linus Torvalds authored
      
      
      Apparently nobody had tried to compile the ALSA CVS tree without power
      management enabled.
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      6fdb94bd
    • Linus Torvalds's avatar
      Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block · d6963615
      Linus Torvalds authored
      * 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
        [PATCH] splice: fix page stealing LRU handling.
        [PATCH] splice: page stealing needs to wait_on_page_writeback()
        [PATCH] splice: export generic_splice_sendpage
        [PATCH] splice: add a SPLICE_F_MORE flag
        [PATCH] splice: add comments documenting more of the code
        [PATCH] splice: improve writeback and clean up page stealing
        [PATCH] splice: fix shadow[] filling logic
      d6963615
    • Jens Axboe's avatar
      [PATCH] splice: fix page stealing LRU handling. · 3e7ee3e7
      Jens Axboe authored
      
      
      Originally from Nick Piggin, just adapted to the newer branch.
      
      You can't check PageLRU without holding zone->lru_lock.  The page
      release code can get away with it only because the page refcount is 0 at
      that point. Also, you can't reliably remove pages from the LRU unless
      the refcount is 0. Ever.
      Signed-off-by: default avatarNick Piggin <nickpiggin@yahoo.com.au>
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      3e7ee3e7
    • Jens Axboe's avatar
      [PATCH] splice: page stealing needs to wait_on_page_writeback() · ad8d6f0a
      Jens Axboe authored
      
      
      Thanks to Andrew for the good explanation of why this is so. akpm writes:
      
      If a page is under writeback and we remove it from pagecache, it's still
      going to get written to disk.  But the VFS no longer knows about that page,
      nor that this page is about to modify disk blocks.
      
      So there might be scenarios in which those
      blocks-which-are-about-to-be-written-to get reused for something else.
      When writeback completes, it'll scribble on those blocks.
      
      This won't happen in ext2/ext3-style filesystems in normal mode because the
      page has buffers and try_to_release_page() will fail.
      
      But ext2 in nobh mode doesn't attach buffers at all - it just sticks the
      page in a BIO, finds some new blocks, points the BIO at those blocks and
      lets it rip.
      
      While that write IO's in flight, someone could truncate the file.  Truncate
      won't block on the writeout because the page isn't in pagecache any more.
      So truncate will the free the blocks from the file under the page's feet.
      Then something else can reallocate those blocks.  Then write data to them.
      
      Now, the original write completes, corrupting the filesystem.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      ad8d6f0a
    • Jens Axboe's avatar
      [PATCH] splice: export generic_splice_sendpage · 059a8f37
      Jens Axboe authored
      
      
      Forgot that one, thanks Jeff. Also move the other EXPORT_SYMBOL
      to right below the functions.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      059a8f37
    • Jens Axboe's avatar
      [PATCH] splice: add a SPLICE_F_MORE flag · b2b39fa4
      Jens Axboe authored
      
      
      This lets userspace indicate whether more data will be coming in a
      subsequent splice call.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      b2b39fa4
    • Jens Axboe's avatar
      [PATCH] splice: add comments documenting more of the code · 83f9135b
      Jens Axboe authored
      
      
      Hopefully this will make Andrew a little more happy.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      83f9135b
    • Jens Axboe's avatar
      [PATCH] splice: improve writeback and clean up page stealing · 4f6f0bd2
      Jens Axboe authored
      
      
      By cleaning up the writeback logic (killing write_one_page() and the manual
      set_page_dirty()), we can get rid of ->stolen inside the pipe_buffer and
      just keep it local in pipe_to_file().
      
      This also adds dirty page balancing logic and O_SYNC handling.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      4f6f0bd2
    • Jens Axboe's avatar
      [PATCH] splice: fix shadow[] filling logic · 53cd9ae8
      Jens Axboe authored
      
      
      Clear the entire range, and don't increment pidx or we keep filling
      the same position again and again.
      
      Thanks to KAMEZAWA Hiroyuki.
      Signed-off-by: default avatarJens Axboe <axboe@suse.de>
      53cd9ae8
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 1810b6cb
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm: (27 commits)
        [ARM] 3433/1: ARM: OMAP: 8/8 Update board files
        [ARM] 3455/1: ARM: OMAP: 7/8 Misc updates, take 2
        [ARM] 3454/1: ARM: OMAP: 6/8 Update framebuffer low-level init code, take 2
        [ARM] 3430/1: ARM: OMAP: 5/8 Update PM
        [ARM] 3429/1: ARM: OMAP: 4/8 Update GPIO
        [ARM] 3428/1: ARM: OMAP: 3/8 Update pin multiplexing
        [ARM] 3427/1: ARM: OMAP: 2/8 Update timers
        [ARM] 3426/1: ARM: OMAP: 1/8 Update clock framework
        [ARM] 3396/2: AT91RM9200 Platform devices update
        [ARM] 3395/2: AT91RM9200 Dataflash Card vs MMC selection
        [ARM] 3393/2: AT91RM9200 LED support
        [ARM] 3453/1: Poodle: Correctly set the memory size
        [ARM] 3446/1: i.MX: MMC/SD SDHC controller registration for i.MX/MX1 MX1ADS board
        [ARM] 3444/1: i.MX: Scatter-gather DMA emulation for i.MX/MX1
        [ARM] 3451/1: ep93xx: use the m48t86 rtc driver on the ts72xx platform
        [ARM] 3450/1: ep93xx: use the ep93xx rtc driver
        [ARM] 3452/1: [S3C2410] RX3715 - add nand information
        [ARM] 3449/1: [S3C2410] Anubis - fix NAND timings
        [ARM] 3448/1: [S3C2410] Settle delay when _enabling_ USB PLL
        [ARM] 3442/1: [S3C2410] SMDK: NAND device setup
        ...
      1810b6cb
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-mmc · ef7a4567
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-mmc:
        [ARM] 3457/1: i.MX: SD/MMC support for i.MX/MX1
        [ARM] 3456/1: AT91RM9200 support for 2.6 (MMC/SD driver)
      ef7a4567
    • Linus Torvalds's avatar
      Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 · a2308b7f
      Linus Torvalds authored
      * git://oss.sgi.com:8090/oss/git/xfs-2.6:
        [XFS] Provide XFS support for the splice syscall.
        [XFS] Reenable write barriers by default.
        [XFS] Make project quota enforcement return an error code consistent with
        [XFS] Implement the silent parameter to fill_super, previously ignored.
        [XFS] Cleanup comment to remove reference to obsoleted function
      a2308b7f