1. 18 Jan, 2011 28 commits
  2. 17 Jan, 2011 12 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 6845a44a
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        RDMA: Update workqueue usage
        RDMA/nes: Fix incorrect SFP+ link status detection on driver init
        RDMA/nes: Fix SFP+ link down detection issue with switch port disable
        RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE events
        RDMA/nes: Fix bonding on iw_nes
        IB/srp: Test only once whether iu allocation succeeded
        IB/mlx4: Handle protocol field in multicast table
        RDMA: Use vzalloc() to replace vmalloc()+memset(0)
        mlx4_{core, ib, en}: Fix driver when sizeof (phys_addr_t) > sizeof (long)
        IB/mthca: Fix driver when sizeof (phys_addr_t) > sizeof (long)
      6845a44a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · eee2a817
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (25 commits)
        Btrfs: forced readonly mounts on errors
        btrfs: Require CAP_SYS_ADMIN for filesystem rebalance
        Btrfs: don't warn if we get ENOSPC in btrfs_block_rsv_check
        btrfs: Fix memory leak in btrfs_read_fs_root_no_radix()
        btrfs: check NULL or not
        btrfs: Don't pass NULL ptr to func that may deref it.
        btrfs: mount failure return value fix
        btrfs: Mem leak in btrfs_get_acl()
        btrfs: fix wrong free space information of btrfs
        btrfs: make the chunk allocator utilize the devices better
        btrfs: restructure find_free_dev_extent()
        btrfs: fix wrong calculation of stripe size
        btrfs: try to reclaim some space when chunk allocation fails
        btrfs: fix wrong data space statistics
        fs/btrfs: Fix build of ctree
        Btrfs: fix off by one while setting block groups readonly
        Btrfs: Add BTRFS_IOC_SUBVOL_GETFLAGS/SETFLAGS ioctls
        Btrfs: Add readonly snapshots support
        Btrfs: Refactor btrfs_ioctl_snap_create()
        btrfs: Extract duplicate decompress code
        ...
      eee2a817
    • Linus Torvalds's avatar
      Revert "mm: simplify code of swap.c" · 83896fb5
      Linus Torvalds authored
      This reverts commit d8505dee.
      
      Chris Mason ended up chasing down some page allocation errors and pages
      stuck waiting on the IO scheduler, and was able to narrow it down to two
      commits: commit 744ed144 ("mm: batch activate_page() to reduce lock
      contention") and d8505dee ("mm: simplify code of swap.c").
      
      This reverts the second one.
      Reported-and-debugged-by: default avatarChris Mason <chris.mason@oracle.com>
      Cc: Mel Gorman <mel@csn.ul.ie>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Jens Axboe <jaxboe@fusionio.com>
      Cc: linux-mm <linux-mm@kvack.org>
      Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Cc: Andrea Arcangeli <aarcange@redhat.com>
      Cc: Shaohua Li <shaohua.li@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      83896fb5
    • Linus Torvalds's avatar
      Revert "mm: batch activate_page() to reduce lock contention" · 7a608572
      Linus Torvalds authored
      This reverts commit 744ed144.
      
      Chris Mason ended up chasing down some page allocation errors and pages
      stuck waiting on the IO scheduler, and was able to narrow it down to two
      commits: commit 744ed144 ("mm: batch activate_page() to reduce lock
      contention") and d8505dee ("mm: simplify code of swap.c").
      
      This reverts the first of them.
      Reported-and-debugged-by: default avatarChris Mason <chris.mason@oracle.com>
      Cc: Mel Gorman <mel@csn.ul.ie>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Jens Axboe <jaxboe@fusionio.com>
      Cc: linux-mm <linux-mm@kvack.org>
      Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Cc: Andrea Arcangeli <aarcange@redhat.com>
      Cc: Shaohua Li <shaohua.li@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7a608572
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 · 9e8a462a
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
        ecryptfs: remove unnecessary decrypt when extending a file
        ecryptfs: Fix ecryptfs_printk() size_t warnings
        fs/ecryptfs: Add printf format/argument verification and fix fallout
        ecryptfs: fixed testing of file descriptor flags
        ecryptfs: test lower_file pointer when lower_file_mutex is locked
        ecryptfs: missing initialization of the superblock 'magic' field
        ecryptfs: moved ECRYPTFS_SUPER_MAGIC definition to linux/magic.h
        ecryptfs: fix truncation error in ecryptfs_read_update_atime
      9e8a462a
    • Geert Uytterhoeven's avatar
      xfs: Do not name variables "panic" · cf78859f
      Geert Uytterhoeven authored
      On platforms that call panic() inside their BUG() macro (m68k/sun3, and
      all platforms that don't set HAVE_ARCH_BUG), compilation fails with:
      
      | fs/xfs/support/debug.c: In function ‘xfs_cmn_err’:
      | fs/xfs/support/debug.c:92: error: called object ‘panic’ is not a function
      
      as the local variable "panic" conflicts with the "panic()" function.
      Rename the local variable to resolve this.
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cf78859f
    • Arnaldo Carvalho de Melo's avatar
      perf tools: Fix tracepoint id to string perf.data header table · ad7f4e3f
      Arnaldo Carvalho de Melo authored
      It was broken by f006d25a that passed just the event name, not the complete
      sys:event that it expected to open the /sys/.../sys/sys:event/id file to get
      the id.
      
      Fix it by moving it to after parse_events in cmd_record, as at that point
      we can just traverse the evsel_list and use evsel->attr.config +
      event_name(evsel) instead of re-opening the /id file.
      Reported-by: default avatarFranck Bui-Huu <vagabon.xyz@gmail.com>
      Cc: Franck Bui-Huu <vagabon.xyz@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Han Pingtian <phan@redhat.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <20110117202801.GG2085@ghostprotocols.net>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      ad7f4e3f
    • liubo's avatar
      Btrfs: forced readonly mounts on errors · acce952b
      liubo authored
      This patch comes from "Forced readonly mounts on errors" ideas.
      
      As we know, this is the first step in being more fault tolerant of disk
      corruptions instead of just using BUG() statements.
      
      The major content:
      - add a framework for generating errors that should result in filesystems
        going readonly.
      - keep FS state in disk super block.
      - make sure that all of resource will be freed and released at umount time.
      - make sure that fter FS is forced readonly on error, there will be no more
        disk change before FS is corrected. For this, we should stop write operation.
      
      After this patch is applied, the conversion from BUG() to such a framework can
      happen incrementally.
      Signed-off-by: default avatarLiu Bo <liubo2009@cn.fujitsu.com>
      Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
      acce952b
    • Linus Torvalds's avatar
      Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 · 8c34482c
      Linus Torvalds authored
      * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
        spi/spi_sh_msiof: fix a wrong free_irq() parameter
        dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()
      8c34482c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 1a47f7a8
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: add cruid= mount option
        cifs: cFYI the entire error code in map_smb_to_linux_error
      1a47f7a8
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · ab2020f2
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (59 commits)
        mtd: mtdpart: disallow reading OOB past the end of the partition
        mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe
        UBI: use mtd->writebufsize to set minimal I/O unit size
        mtd: initialize writebufsize in the MTD object of a partition
        mtd: onenand: add mtd->writebufsize initialization
        mtd: nand: add mtd->writebufsize initialization
        mtd: cfi: add writebufsize initialization
        mtd: add writebufsize field to mtd_info struct
        mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use
        mtd: OneNAND: add enable / disable methods to onenand_chip
        mtd: m25p80: Fix JEDEC ID for AT26DF321
        mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max)
        mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips
        mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips
        mtd: nand: ams-delta: drop omap_read/write, use ioremap
        mtd: m25p80: add debugging trace in sst_write
        mtd: nand: ams-delta: select for built-in by default
        mtd: OneNAND: lighten scary initial bad block messages
        mtd: OneNAND: OMAP2/3: add support for command line partitioning
        mtd: nand: rearrange ONFI revision checking, add ONFI 2.3
        ...
      
      Fix up trivial conflict in drivers/mtd/Kconfig as per DavidW.
      ab2020f2
    • Frank Swiderski's avatar
      ecryptfs: remove unnecessary decrypt when extending a file · 24562486
      Frank Swiderski authored
      Removes an unecessary page decrypt from ecryptfs_begin_write when the
      page is beyond the current file size. Previously, the call to
      ecryptfs_decrypt_page would result in a read of 0 bytes, but still
      attempt to decrypt an entire page. This patch detects that case and
      merely zeros the page before marking it up-to-date.
      Signed-off-by: default avatarFrank Swiderski <fes@chromium.org>
      Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
      24562486