1. 29 1月, 2014 10 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · d891ea23
      Linus Torvalds 提交于
      Pull ceph updates from Sage Weil:
       "This is a big batch.  From Ilya we have:
      
         - rbd support for more than ~250 mapped devices (now uses same scheme
           that SCSI does for device major/minor numbering)
         - crush updates for new mapping behaviors (will be needed for coming
           erasure coding support, among other things)
         - preliminary support for tiered storage pools
      
        There is also a big series fixing a pile cephfs bugs with clustered
        MDSs from Yan Zheng, ACL support for cephfs from Guangliang Zhao, ceph
        fscache improvements from Li Wang, improved behavior when we get
        ENOSPC from Josh Durgin, some readv/writev improvements from
        Majianpeng, and the usual mix of small cleanups"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (76 commits)
        ceph: cast PAGE_SIZE to size_t in ceph_sync_write()
        ceph: fix dout() compile warnings in ceph_filemap_fault()
        libceph: support CEPH_FEATURE_OSD_CACHEPOOL feature
        libceph: follow redirect replies from osds
        libceph: rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid}
        libceph: follow {read,write}_tier fields on osd request submission
        libceph: add ceph_pg_pool_by_id()
        libceph: CEPH_OSD_FLAG_* enum update
        libceph: replace ceph_calc_ceph_pg() with ceph_oloc_oid_to_pg()
        libceph: introduce and start using oid abstraction
        libceph: rename MAX_OBJ_NAME_SIZE to CEPH_MAX_OID_NAME_LEN
        libceph: move ceph_file_layout helpers to ceph_fs.h
        libceph: start using oloc abstraction
        libceph: dout() is missing a newline
        libceph: add ceph_kv{malloc,free}() and switch to them
        libceph: support CEPH_FEATURE_EXPORT_PEER
        ceph: add imported caps when handling cap export message
        ceph: add open export target session helper
        ceph: remove exported caps when handling cap import message
        ceph: handle session flush message
        ...
      d891ea23
    • L
      Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd · 08d21b5f
      Linus Torvalds 提交于
      Pull exofs and ore fixes from Boaz Harrosh:
       "The main fix here, the first patch, is also destined for -stable.  The
        rest is small trivia and cosmetics.  The ORE patches effect both exofs
        and pnfs-objects very reproducible bugs"
      
      [ ORE is "object raid engine", used by exofs and pnfs  - Linus ]
      
      * 'for-linus' of git://git.open-osd.org/linux-open-osd:
        exofs: Print less in r4w
        exofs: Allow corrupted directory entry to be empty file
        exofs: Allow O_DIRECT open
        ore: Don't crash on NULL bio in _clear_bio
        ore: Fix wrong math in allocation of per device BIO
      08d21b5f
    • I
      ceph: cast PAGE_SIZE to size_t in ceph_sync_write() · 125d725c
      Ilya Dryomov 提交于
      Use min_t(size_t, ...) instead of plain min(), which does strict type
      checking, to avoid compile warning on i386.
      
      Cc: Jianpeng Ma <majianpeng@gmail.com>
      Signed-off-by: NIlya Dryomov <ilya.dryomov@inktank.com>
      Reviewed-by: NSage Weil <sage@inktank.com>
      125d725c
    • I
      ceph: fix dout() compile warnings in ceph_filemap_fault() · 37b52fe6
      Ilya Dryomov 提交于
      PAGE_CACHE_SIZE is unsigned long on all architectures, however size_t
      is either unsigned int or unsigned long.  Rather than change format
      strings, cast PAGE_CACHE_SIZE to size_t to be in line with dout()s in
      ceph_page_mkwrite().
      
      Cc: Yan, Zheng <zheng.z.yan@intel.com>
      Signed-off-by: NIlya Dryomov <ilya.dryomov@inktank.com>
      Reviewed-by: NSage Weil <sage@inktank.com>
      37b52fe6
    • L
      Merge tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze · 627f4b3e
      Linus Torvalds 提交于
      Pull microblaze patches from Michal Simek:
       - add CCF support
       - fix BS=0 compilation
       - wire up defconfig
       - some minor cleanups and fixes
      
      * tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Add missing v8.50.a version
        microblaze: Fix missing bracket in printk
        microblaze: Fix compilation error for BS=0
        microblaze: Disable stack protection from bootloader
        microblaze: Define read/write{b,w,l}_relaxed MMIO
        microblaze: timer: Do not initialized system timer twice
        microblaze: timer: Use generic sched_clock implementation
        microblaze: Add NOTES section to linker script
        microblaze: Add support for CCF
        microblaze: Simplify fcpu helper function
        microblaze/uapi: Use Kbuild logic to include <asm-generic/types.h>
        microblaze: Remove duplicate declarations of _stext[] and _etext[]
        microblaze: Remove _fdt_start casts
        microblaze: Wire up defconfig to mmu_defconfig
      627f4b3e
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · e770d73c
      Linus Torvalds 提交于
      Pull s390 patches from Martin Schwidefsky:
       "A new binary interface to be able to query and modify the LPAR
        scheduler weight and cap settings.  Some improvements for the hvc
        terminal over iucv and a couple of bux fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/hypfs: add interface for diagnose 0x304
        s390: wire up sys_sched_setattr/sys_sched_getattr
        s390/uapi: fix struct statfs64 definition
        s390/uaccess: remove dead extern declarations, make functions static
        s390/uaccess: test if current->mm is set before walking page tables
        s390/zfcpdump: make zfcpdump depend on 64BIT
        s390/32bit: fix cmpxchg64
        s390/xpram: don't modify module parameters
        s390/zcrypt: remove zcrypt kmsg documentation again
        s390/hvc_iucv: Automatically assign free HVC terminal devices
        s390/hvc_iucv: Display connection details through device attributes
        s390/hvc_iucv: fix sparse warning
        s390/vmur: Link parent CCW device during UR device creation
      e770d73c
    • L
      Merge tag 'cris-correction-for-3.14' of git://jni.nu/cris · be864971
      Linus Torvalds 提交于
      Pull cris fix from Jesper Nilsson:
       "One include too much was removed"
      
      * tag 'cris-correction-for-3.14' of git://jni.nu/cris:
        CRISv10: Readd missing header
      be864971
    • L
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · a53b75b3
      Linus Torvalds 提交于
      Pull ext4 update from Ted Ts'o:
       "Bug fixes and cleanups for ext4.  We also enable the punch hole
        functionality for bigalloc file systems"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: delete "set but not used" variables
        ext4: don't pass freed handle to ext4_walk_page_buffers
        ext4: avoid clearing beyond i_blocks when truncating an inline data file
        ext4: ext4_inode_is_fast_symlink should use EXT4_CLUSTER_SIZE
        ext4: fix a typo in extents.c
        ext4: use %pd printk specificer
        ext4: standardize error handling in ext4_da_write_inline_data_begin()
        ext4: retry allocation when inline->extent conversion failed
        ext4: enable punch hole for bigalloc
      a53b75b3
    • L
      Merge tag 'nfs-for-3.14-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 2b2b15c3
      Linus Torvalds 提交于
      Pull NFS client updates from Trond Myklebust:
       "Highlights include:
      
         - stable fix for an infinite loop in RPC state machine
         - stable fix for a use after free situation in the NFSv4 trunking discovery
         - stable fix for error handling in the NFSv4 trunking discovery
         - stable fix for the page write update code
         - stable fix for the NFSv4.1 mount time security negotiation
         - stable fix for the NFSv4 open code.
         - O_DIRECT locking fixes
         - fix an Oops in the pnfs file commit code
         - RPC layer needs finer grained handling of connection errors
         - more RPC GSS upcall fixes"
      
      * tag 'nfs-for-3.14-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (30 commits)
        pnfs: Proper delay for NFS4ERR_RECALLCONFLICT in layout_get_done
        pnfs: fix BUG in filelayout_recover_commit_reqs
        nfs4: fix discover_server_trunking use after free
        NFSv4.1: Handle errors correctly in nfs41_walk_client_list
        nfs: always make sure page is up-to-date before extending a write to cover the entire page
        nfs: page cache invalidation for dio
        nfs: take i_mutex during direct I/O reads
        nfs: merge nfs_direct_write into nfs_file_direct_write
        nfs: merge nfs_direct_read into nfs_file_direct_read
        nfs: increment i_dio_count for reads, too
        nfs: defer inode_dio_done call until size update is done
        nfs: fix size updates for aio writes
        nfs4.1: properly handle ENOTSUP in SECINFO_NO_NAME
        NFSv4.1: Fix a race in nfs4_write_inode
        NFSv4.1: Don't trust attributes if a pNFS LAYOUTCOMMIT is outstanding
        point to the right include file in a comment (left over from a9004abc)
        NFS: dprintk() should not print negative fileids and inode numbers
        nfs: fix dead code of ipv6_addr_scope
        sunrpc: Fix infinite loop in RPC state machine
        SUNRPC: Add tracepoint for socket errors
        ...
      2b2b15c3
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · bf3d846b
      Linus Torvalds 提交于
      Pull vfs updates from Al Viro:
       "Assorted stuff; the biggest pile here is Christoph's ACL series.  Plus
        assorted cleanups and fixes all over the place...
      
        There will be another pile later this week"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (43 commits)
        __dentry_path() fixes
        vfs: Remove second variable named error in __dentry_path
        vfs: Is mounted should be testing mnt_ns for NULL or error.
        Fix race when checking i_size on direct i/o read
        hfsplus: remove can_set_xattr
        nfsd: use get_acl and ->set_acl
        fs: remove generic_acl
        nfs: use generic posix ACL infrastructure for v3 Posix ACLs
        gfs2: use generic posix ACL infrastructure
        jfs: use generic posix ACL infrastructure
        xfs: use generic posix ACL infrastructure
        reiserfs: use generic posix ACL infrastructure
        ocfs2: use generic posix ACL infrastructure
        jffs2: use generic posix ACL infrastructure
        hfsplus: use generic posix ACL infrastructure
        f2fs: use generic posix ACL infrastructure
        ext2/3/4: use generic posix ACL infrastructure
        btrfs: use generic posix ACL infrastructure
        fs: make posix_acl_create more useful
        fs: make posix_acl_chmod more useful
        ...
      bf3d846b
  2. 28 1月, 2014 30 次提交