1. 11 Jun, 2011 14 commits
  2. 01 Jun, 2011 16 commits
  3. 30 May, 2011 1 commit
  4. 29 May, 2011 9 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 · bd1bfe40
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
        eCryptfs: Remove ecryptfs_header_cache_2
        eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose()
        eCryptfs: Return useful code from contains_ecryptfs_marker
        eCryptfs: Fix new inode race condition
        eCryptfs: Cleanup inode initialization code
        eCryptfs: Consolidate inode functions into inode.c
      bd1bfe40
    • Linus Torvalds's avatar
      Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osd · cd1acdf1
      Linus Torvalds authored
      * 'pnfs-submit' of git://git.open-osd.org/linux-open-osd: (32 commits)
        pnfs-obj: pg_test check for max_io_size
        NFSv4.1: define nfs_generic_pg_test
        NFSv4.1: use pnfs_generic_pg_test directly by layout driver
        NFSv4.1: change pg_test return type to bool
        NFSv4.1: unify pnfs_pageio_init functions
        pnfs-obj: objlayout_encode_layoutcommit implementation
        pnfs: encode_layoutcommit
        pnfs-obj: report errors and .encode_layoutreturn Implementation.
        pnfs: encode_layoutreturn
        pnfs: layoutret_on_setattr
        pnfs: layoutreturn
        pnfs-obj: osd raid engine read/write implementation
        pnfs: support for non-rpc layout drivers
        pnfs-obj: define per-inode private structure
        pnfs: alloc and free layout_hdr layoutdriver methods
        pnfs-obj: objio_osd device information retrieval and caching
        pnfs-obj: decode layout, alloc/free lseg
        pnfs-obj: pnfs_osd XDR client implementation
        pnfs-obj: pnfs_osd XDR definitions
        pnfs-obj: objlayoutdriver module skeleton
        ...
      cd1acdf1
    • Linus Torvalds's avatar
      arm gpio drivers: make them 'depends on ARM' · fac04863
      Linus Torvalds authored
      We had a few drivers move from arch/arm into drivers/gpio, but they
      don't actually compile without the ARM platform headers etc.  As a
      result they were messing up allyesconfig on x86.
      
      Make them depend on ARM.
      Reported-by: default avatarIngo Molnar <mingo@elte.hu>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fac04863
    • Tyler Hicks's avatar
      eCryptfs: Remove ecryptfs_header_cache_2 · 30632870
      Tyler Hicks authored
      Now that ecryptfs_lookup_interpose() is no longer using
      ecryptfs_header_cache_2 to read in metadata, the kmem_cache can be
      removed and the ecryptfs_header_cache_1 kmem_cache can be renamed to
      ecryptfs_header_cache.
      Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
      30632870
    • Tyler Hicks's avatar
      eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose() · 778aeb42
      Tyler Hicks authored
      ecryptfs_lookup_interpose() has turned into spaghetti code over the
      years. This is an effort to clean it up.
      
       - Shorten overly descriptive variable names such as ecryptfs_dentry
       - Simplify gotos and error paths
       - Create helper function for reading plaintext i_size from metadata
      
      It also includes an optimization when reading i_size from the metadata.
      A complete page-sized kmem_cache_alloc() was being done to read in 16
      bytes of metadata. The buffer for that is now statically declared.
      Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
      778aeb42
    • Tyler Hicks's avatar
      eCryptfs: Return useful code from contains_ecryptfs_marker · 7a86617e
      Tyler Hicks authored
      Instead of having the calling functions translate the true/false return
      code to either 0 or -EINVAL, have contains_ecryptfs_marker() return 0 or
      -EINVAL so that the calling functions can just reuse the return code.
      
      Also, rename the function to ecryptfs_validate_marker() to avoid callers
      mistakenly thinking that it returns true/false codes.
      Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
      7a86617e
    • Tyler Hicks's avatar
      eCryptfs: Fix new inode race condition · 3b06b3eb
      Tyler Hicks authored
      Only unlock and d_add() new inodes after the plaintext inode size has
      been read from the lower filesystem. This fixes a race condition that
      was sometimes seen during a multi-job kernel build in an eCryptfs mount.
      
      https://bugzilla.kernel.org/show_bug.cgi?id=36002Signed-off-by: default avatarTyler Hicks <tyhicks@linux.vnet.ibm.com>
      Reported-by: default avatarDavid <david@unsolicited.net>
      Tested-by: default avatarDavid <david@unsolicited.net>
      3b06b3eb
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of... · 2ba781ce
      Linus Torvalds authored
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (43 commits)
        acer-wmi: support integer return type from WMI methods
        msi-laptop: fix section mismatch in reference from the function load_scm_model_init
        acer-wmi: support to set communication device state by new wmid method
        acer-wmi: allow 64-bits return buffer from WMI methods
        acer-wmi: check the existence of internal 3G device when set capability
        platform/x86:delete two unused variables
        support wlan hotkey on Acer Travelmate 5735Z
        platform-x86: intel_mid_thermal: Fix memory leak
        platform/x86: Fix Makefile for intel_mid_powerbtn
        platform/x86: Simplify intel_mid_powerbtn
        acer-wmi: Delete out-of-date documentation
        acerhdf: Clean up includes
        acerhdf: Drop pointless dependency on THERMAL_HWMON
        acer-wmi: Update MAINTAINERS
        wmi: Orphan ACPI-WMI driver
        tc1100-wmi: Orphan driver
        acer-wmi: does not allow negative number set to initial device state
        platform/oaktrail: ACPI EC Extra driver for Oaktrail
        thinkpad_acpi: Convert printks to pr_<level>
        thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warning
        ...
      2ba781ce
    • Linus Torvalds's avatar
      mm: Fix boot crash in mm_alloc() · 6345d24d
      Linus Torvalds authored
      Thomas Gleixner reports that we now have a boot crash triggered by
      CONFIG_CPUMASK_OFFSTACK=y:
      
          BUG: unable to handle kernel NULL pointer dereference at   (null)
          IP: [<c11ae035>] find_next_bit+0x55/0xb0
          Call Trace:
           [<c11addda>] cpumask_any_but+0x2a/0x70
           [<c102396b>] flush_tlb_mm+0x2b/0x80
           [<c1022705>] pud_populate+0x35/0x50
           [<c10227ba>] pgd_alloc+0x9a/0xf0
           [<c103a3fc>] mm_init+0xec/0x120
           [<c103a7a3>] mm_alloc+0x53/0xd0
      
      which was introduced by commit de03c72c ("mm: convert
      mm->cpu_vm_cpumask into cpumask_var_t"), and is due to wrong ordering of
      mm_init() vs mm_init_cpumask
      
      Thomas wrote a patch to just fix the ordering of initialization, but I
      hate the new double allocation in the fork path, so I ended up instead
      doing some more radical surgery to clean it all up.
      Reported-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Reported-by: default avatarIngo Molnar <mingo@elte.hu>
      Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6345d24d