1. 08 10月, 2012 7 次提交
  2. 07 10月, 2012 19 次提交
  3. 03 10月, 2012 14 次提交
    • L
      Merge tag 'stable/for-linus-3.7-x86-tag' of... · 56d92aa5
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen update from Konrad Rzeszutek Wilk:
       "Features:
         - When hotplugging PCI devices in a PV guest we can allocate
           Xen-SWIOTLB later.
         - Cleanup Xen SWIOTLB.
         - Support pages out grants from HVM domains in the backends.
         - Support wild cards in xen-pciback.hide=(BDF) arguments.
         - Update grant status updates with upstream hypervisor.
         - Boot PV guests with more than 128GB.
         - Cleanup Xen MMU code/add comments.
         - Obtain XENVERS using a preferred method.
         - Lay out generic changes to support Xen ARM.
         - Allow privcmd ioctl for HVM (used to do only PV).
         - Do v2 of mmap_batch for privcmd ioctls.
         - If hypervisor saves the LED keyboard light - we will now instruct
           the kernel about its state.
        Fixes:
         - More fixes to Xen PCI backend for various calls/FLR/etc.
         - With more than 4GB in a 64-bit PV guest disable native SWIOTLB.
         - Fix up smatch warnings.
         - Fix up various return values in privmcmd and mm."
      
      * tag 'stable/for-linus-3.7-x86-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (48 commits)
        xen/pciback: Restore the PCI config space after an FLR.
        xen-pciback: properly clean up after calling pcistub_device_find()
        xen/vga: add the xen EFI video mode support
        xen/x86: retrieve keyboard shift status flags from hypervisor.
        xen/gndev: Xen backend support for paged out grant targets V4.
        xen-pciback: support wild cards in slot specifications
        xen/swiotlb: Fix compile warnings when using plain integer instead of NULL pointer.
        xen/swiotlb: Remove functions not needed anymore.
        xen/pcifront: Use Xen-SWIOTLB when initting if required.
        xen/swiotlb: For early initialization, return zero on success.
        xen/swiotlb: Use the swiotlb_late_init_with_tbl to init Xen-SWIOTLB late when PV PCI is used.
        xen/swiotlb: Move the error strings to its own function.
        xen/swiotlb: Move the nr_tbl determination in its own function.
        xen/arm: compile and run xenbus
        xen: resynchronise grant table status codes with upstream
        xen/privcmd: return -EFAULT on error
        xen/privcmd: Fix mmap batch ioctl error status copy back.
        xen/privcmd: add PRIVCMD_MMAPBATCH_V2 ioctl
        xen/mm: return more precise error from xen_remap_domain_range()
        xen/mmu: If the revector fails, don't attempt to revector anything else.
        ...
      56d92aa5
    • L
      Merge tag 'stable/for-linus-3.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm · 33c2a174
      Linus Torvalds 提交于
      Pull frontswap update from Konrad Rzeszutek Wilk:
       "Features:
         - Support exlusive get if backend is capable.
        Bug-fixes:
         - Fix compile warnings
         - Add comments/cleanup doc
         - Fix wrong if condition"
      
      * tag 'stable/for-linus-3.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
        frontswap: support exclusive gets if tmem backend is capable
        mm: frontswap: fix a wrong if condition in frontswap_shrink
        mm/frontswap: fix uninit'ed variable warning
        mm/frontswap: cleanup doc and comment error
        mm: frontswap: remove unneeded headers
      33c2a174
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 88265322
      Linus Torvalds 提交于
      Pull security subsystem updates from James Morris:
       "Highlights:
      
         - Integrity: add local fs integrity verification to detect offline
           attacks
         - Integrity: add digital signature verification
         - Simple stacking of Yama with other LSMs (per LSS discussions)
         - IBM vTPM support on ppc64
         - Add new driver for Infineon I2C TIS TPM
         - Smack: add rule revocation for subject labels"
      
      Fixed conflicts with the user namespace support in kernel/auditsc.c and
      security/integrity/ima/ima_policy.c.
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (39 commits)
        Documentation: Update git repository URL for Smack userland tools
        ima: change flags container data type
        Smack: setprocattr memory leak fix
        Smack: implement revoking all rules for a subject label
        Smack: remove task_wait() hook.
        ima: audit log hashes
        ima: generic IMA action flag handling
        ima: rename ima_must_appraise_or_measure
        audit: export audit_log_task_info
        tpm: fix tpm_acpi sparse warning on different address spaces
        samples/seccomp: fix 31 bit build on s390
        ima: digital signature verification support
        ima: add support for different security.ima data types
        ima: add ima_inode_setxattr/removexattr function and calls
        ima: add inode_post_setattr call
        ima: replace iint spinblock with rwlock/read_lock
        ima: allocating iint improvements
        ima: add appraise action keywords and default rules
        ima: integrity appraisal extension
        vfs: move ima_file_free before releasing the file
        ...
      88265322
    • L
      Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubi · 65b99c74
      Linus Torvalds 提交于
      Pull UBI changes from Artem Bityutskiy:
       "The main change is the way we reserve eraseblocks for bad blocks
        handling.  We used to reserve 2% of the partition, but now we are more
        aggressive and we reserve 2% of the entire chip, which is what
        actually manufacturers specify in data sheets.  We introduced an
        option to users to override the default, though.
      
        There are a couple of fixes as well, and a number of cleanups."
      
      * tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubi: (24 commits)
        UBI: fix trivial typo 'it' => 'is'
        UBI: load after mtd device drivers
        UBI: print less
        UBI: use pr_ helper instead of printk
        UBI: comply with coding style
        UBI: erase free PEB with bitflip in EC header
        UBI: fix autoresize handling in R/O mode
        UBI: add max_beb_per1024 to attach ioctl
        UBI: allow specifying bad PEBs limit using module parameter
        UBI: check max_beb_per1024 value in ubi_attach_mtd_dev
        UBI: prepare for max_beb_per1024 module parameter addition
        UBI: introduce MTD_PARAM_MAX_COUNT
        UBI: separate bad_peb_limit in a function
        arm: sam9_l9260_defconfig: correct CONFIG_MTD_UBI_BEB_LIMIT
        UBI: use the whole MTD device size to get bad_peb_limit
        mtd: mtdparts: introduce mtd_get_device_size
        mtd: mark mtd_is_partition argument as constant
        arm: sam9_l9260_defconfig: remove non-existing config option
        UBI: kill CONFIG_MTD_UBI_BEB_RESERVE
        UBI: limit amount of reserved eraseblocks for bad PEB handling
        ...
      65b99c74
    • L
      Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs · 782c3fb2
      Linus Torvalds 提交于
      Pull ubifs changes from Artem Bityutskiy:
       "No big changes for 3.7 in UBIFS:
         - Error reporting and debug printing improvements
         - Power cut emulation fixes
         - Minor cleanups"
      
      Fix trivial conflict in fs/ubifs/debug.c due to the user namespace
      changes.
      
      * tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs:
        UBIFS: print less
        UBIFS: use pr_ helper instead of printk
        UBIFS: comply with coding style
        UBIFS: use __aligned() attribute
        UBIFS: remove __DATE__ and __TIME__
        UBIFS: fix power cut emulation for mtdram
        UBIFS: improve scanning debug output
        UBIFS: always print full error reports
        UBIFS: print PID in debug messages
      782c3fb2
    • L
      Merge tag 'for-linus-v3.7-rc1' of git://oss.sgi.com/xfs/xfs · 60c7b4df
      Linus Torvalds 提交于
      Pull xfs update from Ben Myers:
       "Several enhancements and cleanups:
      
         - make inode32 and inode64 remountable options
         - SEEK_HOLE/SEEK_DATA enhancements
         - cleanup struct declarations in xfs_mount.h"
      
      * tag 'for-linus-v3.7-rc1' of git://oss.sgi.com/xfs/xfs:
        xfs: Make inode32 a remountable option
        xfs: add inode64->inode32 transition into xfs_set_inode32()
        xfs: Fix mp->m_maxagi update during inode64 remount
        xfs: reduce code duplication handling inode32/64 options
        xfs: make inode64 as the default allocation mode
        xfs: Fix m_agirotor reset during AG selection
        Make inode64 a remountable option
        xfs: stop the sync worker before xfs_unmountfs
        xfs: xfs_seek_hole() refinement with hole searching from page cache for unwritten extents
        xfs: xfs_seek_data() refinement with unwritten extents check up from page cache
        xfs: Introduce a helper routine to probe data or hole offset from page cache
        xfs: Remove type argument from xfs_seek_data()/xfs_seek_hole()
        xfs: fix race while discarding buffers [V4]
        xfs: check for possible overflow in xfs_ioc_trim
        xfs: unlock the AGI buffer when looping in xfs_dialloc
        xfs: kill struct declarations in xfs_mount.h
        xfs: fix uninitialised variable in xfs_rtbuf_get()
      60c7b4df
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · aab174f0
      Linus Torvalds 提交于
      Pull vfs update from Al Viro:
      
       - big one - consolidation of descriptor-related logics; almost all of
         that is moved to fs/file.c
      
         (BTW, I'm seriously tempted to rename the result to fd.c.  As it is,
         we have a situation when file_table.c is about handling of struct
         file and file.c is about handling of descriptor tables; the reasons
         are historical - file_table.c used to be about a static array of
         struct file we used to have way back).
      
         A lot of stray ends got cleaned up and converted to saner primitives,
         disgusting mess in android/binder.c is still disgusting, but at least
         doesn't poke so much in descriptor table guts anymore.  A bunch of
         relatively minor races got fixed in process, plus an ext4 struct file
         leak.
      
       - related thing - fget_light() partially unuglified; see fdget() in
         there (and yes, it generates the code as good as we used to have).
      
       - also related - bits of Cyrill's procfs stuff that got entangled into
         that work; _not_ all of it, just the initial move to fs/proc/fd.c and
         switch of fdinfo to seq_file.
      
       - Alex's fs/coredump.c spiltoff - the same story, had been easier to
         take that commit than mess with conflicts.  The rest is a separate
         pile, this was just a mechanical code movement.
      
       - a few misc patches all over the place.  Not all for this cycle,
         there'll be more (and quite a few currently sit in akpm's tree)."
      
      Fix up trivial conflicts in the android binder driver, and some fairly
      simple conflicts due to two different changes to the sock_alloc_file()
      interface ("take descriptor handling from sock_alloc_file() to callers"
      vs "net: Providing protocol type via system.sockprotoname xattr of
      /proc/PID/fd entries" adding a dentry name to the socket)
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (72 commits)
        MAX_LFS_FILESIZE should be a loff_t
        compat: fs: Generic compat_sys_sendfile implementation
        fs: push rcu_barrier() from deactivate_locked_super() to filesystems
        btrfs: reada_extent doesn't need kref for refcount
        coredump: move core dump functionality into its own file
        coredump: prevent double-free on an error path in core dumper
        usb/gadget: fix misannotations
        fcntl: fix misannotations
        ceph: don't abuse d_delete() on failure exits
        hypfs: ->d_parent is never NULL or negative
        vfs: delete surplus inode NULL check
        switch simple cases of fget_light to fdget
        new helpers: fdget()/fdput()
        switch o2hb_region_dev_write() to fget_light()
        proc_map_files_readdir(): don't bother with grabbing files
        make get_file() return its argument
        vhost_set_vring(): turn pollstart/pollstop into bool
        switch prctl_set_mm_exe_file() to fget_light()
        switch xfs_find_handle() to fget_light()
        switch xfs_swapext() to fget_light()
        ...
      aab174f0
    • L
      Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · ca41cc96
      Linus Torvalds 提交于
      Pull CMA and DMA-mapping updates from Marek Szyprowski:
       "This time the pull request is rather small, because the further
        redesign patches were not ready on time.
      
        This pull request consists of the patches which extend ARM DMA-mapping
        subsystem with support for CPU coherent (ACP) DMA busses.  The first
        client of the new version is HighBank SATA driver.  The second part of
        the pull request includes various cleanup for both CMA common code and
        ARM DMA-mapping subsystem."
      
      Fix up trivial add-add conflict due to the "dma-coherent" DT property
      being added next to the "calxeda,port-phys" property for the Calxeda
      AHCI controller.
      
      * 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        ARM: dma-mapping: Remove unsed var at arm_coherent_iommu_unmap_page
        ARM: highbank: add coherent DMA setup
        ARM: kill off arch_is_coherent
        ARM: add coherent iommu dma ops
        ARM: add coherent dma ops
        ARM: dma-mapping: Refrain noisy console message
        ARM: dma-mapping: Small logical clean up
        drivers: dma-contiguous: refactor dma_alloc_from_contiguous()
      ca41cc96
    • L
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 3151367f
      Linus Torvalds 提交于
      Pull first round of SCSI updates from James Bottomley:
       "This is a large set of updates, mostly for drivers (qla2xxx [including
        support for new 83xx based card], qla4xxx, mpt2sas, bfa, zfcp, hpsa,
        be2iscsi, isci, lpfc, ipr, ibmvfc, ibmvscsi, megaraid_sas).
      
        There's also a rework for tape adding virtually unlimited numbers of
        tape drives plus a set of dif fixes for sd and a fix for a live lock
        on hot remove of SCSI devices.
      
        This round includes a signed tag pull of isci-for-3.6
      
        Signed-off-by: James Bottomley <JBottomley@Parallels.com>"
      
      Fix up trivial conflict in drivers/scsi/qla2xxx/qla_nx.c due to new PCI
      helper function use in a function that was removed by this pull.
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (198 commits)
        [SCSI] st: remove st_mutex
        [SCSI] sd: Ensure we correctly disable devices with unknown protection type
        [SCSI] hpsa: gen8plus Smart Array IDs
        [SCSI] qla4xxx: Update driver version to 5.03.00-k1
        [SCSI] qla4xxx: Disable generating pause frames for ISP83XX
        [SCSI] qla4xxx: Fix double clearing of risc_intr for ISP83XX
        [SCSI] qla4xxx: IDC implementation for Loopback
        [SCSI] qla4xxx: update copyrights in LICENSE.qla4xxx
        [SCSI] qla4xxx: Fix panic while rmmod
        [SCSI] qla4xxx: Fail probe_adapter if IRQ allocation fails
        [SCSI] qla4xxx: Prevent MSI/MSI-X falling back to INTx for ISP82XX
        [SCSI] qla4xxx: Update idc reg in case of PCI AER
        [SCSI] qla4xxx: Fix double IDC locking in qla4_8xxx_error_recovery
        [SCSI] qla4xxx: Clear interrupt while unloading driver for ISP83XX
        [SCSI] qla4xxx: Print correct IDC version
        [SCSI] qla4xxx: Added new mbox cmd to pass driver version to FW
        [SCSI] scsi_dh_alua: Enable STPG for unavailable ports
        [SCSI] scsi_remove_target: fix softlockup regression on hot remove
        [SCSI] ibmvscsi: Fix host config length field overflow
        [SCSI] ibmvscsi: Remove backend abstraction
        ...
      3151367f
    • C
      MAX_LFS_FILESIZE should be a loff_t · 2bd2c194
      Chuck Lever 提交于
      fs/nfs/internal.h: In function ‘nfs_super_set_maxbytes’:
      fs/nfs/internal.h:547:21: warning: comparison between signed and
          unsigned integer expressions [-Wsign-compare]
      
      Seen with gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2).
      
      Commit 42cb56ae made s_maxbytes a loff_t, thus the type of
      MAX_LFS_FILESIZE should also be a loff_t.
      Signed-off-by: NChuck Lever <chuck.lever@oracle.com>
      Acked-by: NJeff Layton <jlayton@redhat.com>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      2bd2c194
    • C
      compat: fs: Generic compat_sys_sendfile implementation · 8f9c0119
      Catalin Marinas 提交于
      This function is used by sparc, powerpc and arm64 for compat support.
      The patch adds a generic implementation which calls do_sendfile()
      directly and avoids set_fs().
      
      The sparc architecture has wrappers for the sign extensions while
      powerpc relies on the compiler to do the this. The patch adds wrappers
      for powerpc to handle the u32->int type conversion.
      
      compat_sys_sendfile64() can be replaced by a sys_sendfile() call since
      compat_loff_t has the same size as off_t on a 64-bit system.
      
      On powerpc, the patch also changes the 64-bit sendfile call from
      sys_sendile64 to sys_sendfile.
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      Acked-by: NDavid S. Miller <davem@davemloft.net>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Alexander Viro <viro@zeniv.linux.org.uk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      8f9c0119
    • K
      fs: push rcu_barrier() from deactivate_locked_super() to filesystems · 8c0a8537
      Kirill A. Shutemov 提交于
      There's no reason to call rcu_barrier() on every
      deactivate_locked_super().  We only need to make sure that all delayed rcu
      free inodes are flushed before we destroy related cache.
      
      Removing rcu_barrier() from deactivate_locked_super() affects some fast
      paths.  E.g.  on my machine exit_group() of a last process in IPC
      namespace takes 0.07538s.  rcu_barrier() takes 0.05188s of that time.
      Signed-off-by: NKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      8c0a8537
    • A
      btrfs: reada_extent doesn't need kref for refcount · 99621b44
      Al Viro 提交于
      All increments and decrements are under the same spinlock - have to be,
      since they need to protect the radix_tree it's found in.  Just use
      int, no need to wank with kref...
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      99621b44
    • A
      coredump: move core dump functionality into its own file · 10c28d93
      Alex Kelly 提交于
      This prepares for making core dump functionality optional.
      
      The variable "suid_dumpable" and associated functions are left in fs/exec.c
      because they're used elsewhere, such as in ptrace.
      Signed-off-by: NAlex Kelly <alex.page.kelly@gmail.com>
      Reviewed-by: NJosh Triplett <josh@joshtriplett.org>
      Acked-by: NSerge Hallyn <serge.hallyn@canonical.com>
      Acked-by: NKees Cook <keescook@chromium.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      10c28d93