20 Sep, 2013

1 commit

  • Pull ceph fixes from Sage Weil:
    "These fix several bugs with RBD from 3.11 that didn't get tested in
    time for the merge window: some error handling, a use-after-free, and
    a sequencing issue when unmapping and image races with a notify
    operation.

    There is also a patch fixing a problem with the new ceph + fscache
    code that just went in"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
    fscache: check consistency does not decrement refcount
    rbd: fix error handling from rbd_snap_name()
    rbd: ignore unmapped snapshots that no longer exist
    rbd: fix use-after free of rbd_dev->disk
    rbd: make rbd_obj_notify_ack() synchronous
    rbd: complete notifies before cleaning up osd_client and rbd_dev
    libceph: add function to ensure notifies are complete

    Linus Torvalds
     

19 Sep, 2013

2 commits

  • Pull vfs fixes from Al Viro:
    "atomic_open-related fixes (Miklos' series, with EEXIST-related parts
    replaced with fix in fs/namei.c:atomic_open() instead of messing with
    the instances) + race fix in autofs + leak on failure exit in 9p"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
    9p: don't forget to destroy inode cache if fscache registration fails
    atomic_open: take care of EEXIST in no-open case with O_CREAT|O_EXCL in fs/namei.c
    vfs: don't set FILE_CREATED before calling ->atomic_open()
    nfs: set FILE_CREATED
    gfs2: set FILE_CREATED
    cifs: fix filp leak in cifs_atomic_open()
    vfs: improve i_op->atomic_open() documentation
    autofs4: close the races around autofs4_notify_daemon()

    Linus Torvalds
     
  • Pull pstore/compression fixes from Tony Luck:
    "Three pstore fixes related to compression:
    1) Better adjustment of size of compression buffer (was too big for
    EFIVARS backend resulting in compression failure
    2) Use zlib_inflateInit2 instead of zlib_inflateInit
    3) Don't print messages about compression failure. They will waste
    space that may better be used to log console output leading to the
    crash"

    * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
    pstore: Remove the messages related to compression failure
    pstore: Use zlib_inflateInit2 instead of zlib_inflateInit
    pstore: Adjust buffer size for compression for smaller registered buffers

    Linus Torvalds
     

18 Sep, 2013

2 commits


17 Sep, 2013

11 commits

  • If O_CREAT|O_EXCL are passed to open, then we know that either

    - the file is successfully created, or
    - the operation fails in some way.

    So previously we set FILE_CREATED before calling ->atomic_open() so the
    filesystem doesn't have to. This, however, led to bugs in the
    implementation that went unnoticed when the filesystem didn't check for
    existence, yet returned success. To prevent this kind of bug, require
    filesystems to always explicitly set FILE_CREATED on O_CREAT|O_EXCL and
    verify this in the VFS.

    Also added a couple more verifications for the result of atomic_open():

    - Warn if filesystem set FILE_CREATED despite the lack of O_CREAT.
    - Warn if filesystem set FILE_CREATED but gave a negative dentry.

    Signed-off-by: Miklos Szeredi
    Signed-off-by: Al Viro

    Miklos Szeredi
     
  • Set FILE_CREATED on O_CREAT|O_EXCL. If the NFS server honored our request
    for exclusivity then this must be correct.

    Currently this is a no-op, since the VFS sets FILE_CREATED anyway. The
    next patch will, however, require this flag to be always set by
    filesystems.

    Signed-off-by: Miklos Szeredi
    Cc: Trond Myklebust
    Signed-off-by: Al Viro

    Miklos Szeredi
     
  • In gfs2_create_inode() set FILE_CREATED in *opened.

    Signed-off-by: Miklos Szeredi
    Cc: Steven Whitehouse
    Signed-off-by: Al Viro

    Miklos Szeredi
     
  • If an error occurs after having called finish_open() then fput() needs to
    be called on the already opened file.

    Signed-off-by: Miklos Szeredi
    Cc: Steve French
    Cc: stable@vger.kernel.org
    Signed-off-by: Al Viro

    Miklos Szeredi
     
  • Fix documentation of ->atomic_open() and related functions: finish_open()
    and finish_no_open(). Also add details that seem to be unclear and a
    source of bugs (some of which are fixed in the following series).

    Cc-ing maintainers of all filesystems implementing ->atomic_open().

    Signed-off-by: Miklos Szeredi
    Cc: Eric Van Hensbergen
    Cc: Sage Weil
    Cc: Steve French
    Cc: Steven Whitehouse
    Cc: Trond Myklebust
    Signed-off-by: Al Viro

    Miklos Szeredi
     
  • Don't drop ->wq_mutex before calling autofs4_notify_daemon() only to regain it
    there. Besides being pointless, that opens a race window where autofs4_wait_release()
    could've come and freed wq->name.name. And do the debugging printk in the "reused an
    existing wq" case before dropping ->wq_mutex - the same reason...

    Signed-off-by: Al Viro
    Acked-by: Ian Kent

    Al Viro
     
  • Pull CIFS fixes from Steve French:
    "Two minor cifs fixes and a minor documentation cleanup for cifs.txt"

    * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
    cifs: update cifs.txt and remove some outdated infos
    cifs: Avoid calling unlock_page() twice in cifs_readpage() when using fscache
    cifs: Do not take a reference to the page in cifs_readpage_worker()

    Linus Torvalds
     
  • Pull ubifs fix from Artem Bityutskiy:
    "Just one patch which fixes the power-cut recovery testing mode.

    I'll start using a single UBI/UBIFS tree instead of 2 trees from now
    on. So in the future you'll get 1 small pull request instead of 2
    tiny ones"

    * tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs:
    UBIFS: remove invalid warn msg with tst_recovery enabled

    Linus Torvalds
     
  • Remove the messages indicating compression failure as it will
    add to the space during panic path.

    Reported-by: Seiji Aguchi
    Tested-by: Seiji Aguchi
    Signed-off-by: Aruna Balakrishnaiah
    Signed-off-by: Tony Luck

    Aruna Balakrishnaiah
     
  • Since zlib_deflateInit2() is used for specifying window bit during compression,
    zlib_inflateInit2() is appropriate for decompression.

    Reported-by: Seiji Aguchi
    Tested-by: Seiji Aguchi
    Signed-off-by: Aruna Balakrishnaiah
    Signed-off-by: Tony Luck

    Aruna Balakrishnaiah
     
  • When backends (ex: efivars) have smaller registered buffers, the
    big_oops_buf is too big for them as number of repeated occurences
    in the text captured will be less. What happens is that pstore takes
    too big a bite from the dmesg log and then finds it cannot compress it
    enough to meet the backend block size. Patch takes care of adjusting
    the buffer size based on the registered buffer size. cmpr values have
    been arrived after doing experiments with plain text for buffers of
    size 1k - 4k (Smaller the buffer size repeated occurence will be less)
    and with sample crash log for buffers ranging from 4k - 10k.

    Reported-by: Seiji Aguchi
    Tested-by: Seiji Aguchi
    Signed-off-by: Aruna Balakrishnaiah
    Signed-off-by: Tony Luck

    Aruna Balakrishnaiah
     

15 Sep, 2013

1 commit


14 Sep, 2013

5 commits

  • Pull writeback fix from Wu Fengguang:
    "A trivial writeback fix"

    * tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
    writeback: Do not sort b_io list only because of block device inode

    Linus Torvalds
     
  • The LRU list changes interacted badly with our nr_dentry_unused
    accounting, and even worse with the new DCACHE_LRU_LIST bit logic.

    This introduces helper functions to make sure everything follows the
    proper dcache d_lru list rules: the dentry cache is complicated by the
    fact that some of the hotpaths don't even want to look at the LRU list
    at all, and the fact that we use the same list entry in the dentry for
    both the LRU list and for our temporary shrinking lists when removing
    things from the LRU.

    The helper functions temporarily have some extra sanity checking for the
    flag bits that have to match the current LRU state of the dentry. We'll
    remove that before the final 3.12 release, but considering how easy it
    is to get wrong, this first cleanup version has some very particular
    sanity checking.

    Acked-by: Al Viro
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • When reading a single page with cifs_readpage(), we make a call to
    fscache_read_or_alloc_page() which once done, asynchronously calls
    the completion function cifs_readpage_from_fscache_complete(). This
    completion function unlocks the page once it has been populated from
    cache. The module then attempts to unlock the page a second time in
    cifs_readpage() which leads to warning messages.

    In case of a successful call to fscache_read_or_alloc_page() we should skip
    the second unlock_page() since this will be called by the
    cifs_readpage_from_fscache_complete() once the page has been populated by
    fscache.

    With the modifications to cifs_readpage_worker(), we will need to re-grab the
    page lock in cifs_write_begin().

    The problem was first noticed when testing new fscache patches for cifs.
    https://bugzilla.redhat.com/show_bug.cgi?id=1005737

    Signed-off-by: Sachin Prabhu
    Reviewed-by: Jeff Layton
    Signed-off-by: Steve French

    Sachin Prabhu
     
  • We do not need to take a reference to the pagecache in
    cifs_readpage_worker() since the calling function will have already
    taken one before passing the pointer to the page as an argument to the
    function.

    Signed-off-by: Sachin Prabhu
    Reviewed-by: Jeff Layton
    Signed-off-by: Steve French

    Sachin Prabhu
     
  • Pull aio changes from Ben LaHaise:
    "First off, sorry for this pull request being late in the merge window.
    Al had raised a couple of concerns about 2 items in the series below.
    I addressed the first issue (the race introduced by Gu's use of
    mm_populate()), but he has not provided any further details on how he
    wants to rework the anon_inode.c changes (which were sent out months
    ago but have yet to be commented on).

    The bulk of the changes have been sitting in the -next tree for a few
    months, with all the issues raised being addressed"

    * git://git.kvack.org/~bcrl/aio-next: (22 commits)
    aio: rcu_read_lock protection for new rcu_dereference calls
    aio: fix race in ring buffer page lookup introduced by page migration support
    aio: fix rcu sparse warnings introduced by ioctx table lookup patch
    aio: remove unnecessary debugging from aio_free_ring()
    aio: table lookup: verify ctx pointer
    staging/lustre: kiocb->ki_left is removed
    aio: fix error handling and rcu usage in "convert the ioctx list to table lookup v3"
    aio: be defensive to ensure request batching is non-zero instead of BUG_ON()
    aio: convert the ioctx list to table lookup v3
    aio: double aio_max_nr in calculations
    aio: Kill ki_dtor
    aio: Kill ki_users
    aio: Kill unneeded kiocb members
    aio: Kill aio_rw_vect_retry()
    aio: Don't use ctx->tail unnecessarily
    aio: io_cancel() no longer returns the io_event
    aio: percpu ioctx refcount
    aio: percpu reqs_available
    aio: reqs_active -> reqs_available
    aio: fix build when migration is disabled
    ...

    Linus Torvalds
     

13 Sep, 2013

13 commits

  • Pull xfs update #2 from Ben Myers:
    "Here we have defrag support for v5 superblock, a number of bugfixes
    and a cleanup or two.

    - defrag support for CRC filesystems
    - fix endian worning in xlog_recover_get_buf_lsn
    - fixes for sparse warnings
    - fix for assert in xfs_dir3_leaf_hdr_from_disk
    - fix for log recovery of remote symlinks
    - fix for log recovery of btree root splits
    - fixes formemory allocation failures with ACLs
    - fix for assert in xfs_buf_item_relse
    - fix for assert in xfs_inode_buf_verify
    - fix an assignment in an assert that should be a test in
    xfs_bmbt_change_owner
    - remove dead code in xlog_recover_inode_pass2"

    * tag 'xfs-for-linus-v3.12-rc1-2' of git://oss.sgi.com/xfs/xfs:
    xfs: remove dead code from xlog_recover_inode_pass2
    xfs: = vs == typo in ASSERT()
    xfs: don't assert fail on bad inode numbers
    xfs: aborted buf items can be in the AIL.
    xfs: factor all the kmalloc-or-vmalloc fallback allocations
    xfs: fix memory allocation failures with ACLs
    xfs: ensure we copy buffer type in da btree root splits
    xfs: set remote symlink buffer type for recovery
    xfs: recovery of swap extents operations for CRC filesystems
    xfs: swap extents operations for CRC filesystems
    xfs: check magic numbers in dir3 leaf verifier first
    xfs: fix some minor sparse warnings
    xfs: fix endian warning in xlog_recover_get_buf_lsn()

    Linus Torvalds
     
  • Merge more patches from Andrew Morton:
    "The rest of MM. Plus one misc cleanup"

    * emailed patches from Andrew Morton : (35 commits)
    mm/Kconfig: add MMU dependency for MIGRATION.
    kernel: replace strict_strto*() with kstrto*()
    mm, thp: count thp_fault_fallback anytime thp fault fails
    thp: consolidate code between handle_mm_fault() and do_huge_pmd_anonymous_page()
    thp: do_huge_pmd_anonymous_page() cleanup
    thp: move maybe_pmd_mkwrite() out of mk_huge_pmd()
    mm: cleanup add_to_page_cache_locked()
    thp: account anon transparent huge pages into NR_ANON_PAGES
    truncate: drop 'oldsize' truncate_pagecache() parameter
    mm: make lru_add_drain_all() selective
    memcg: document cgroup dirty/writeback memory statistics
    memcg: add per cgroup writeback pages accounting
    memcg: check for proper lock held in mem_cgroup_update_page_stat
    memcg: remove MEMCG_NR_FILE_MAPPED
    memcg: reduce function dereference
    memcg: avoid overflow caused by PAGE_ALIGN
    memcg: rename RESOURCE_MAX to RES_COUNTER_MAX
    memcg: correct RESOURCE_MAX to ULLONG_MAX
    mm: memcg: do not trap chargers with full callstack on OOM
    mm: memcg: rework and document OOM waiting and wakeup
    ...

    Linus Torvalds
     
  • We use NR_ANON_PAGES as base for reporting AnonPages to user. There's
    not much sense in not accounting transparent huge pages there, but add
    them on printing to user.

    Let's account transparent huge pages in NR_ANON_PAGES in the first place.

    Signed-off-by: Kirill A. Shutemov
    Acked-by: Dave Hansen
    Cc: Andrea Arcangeli
    Cc: Al Viro
    Cc: Hugh Dickins
    Cc: Wu Fengguang
    Cc: Jan Kara
    Cc: Mel Gorman
    Cc: Andi Kleen
    Cc: Matthew Wilcox
    Cc: Hillf Danton
    Cc: Ning Qu
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kirill A. Shutemov
     
  • truncate_pagecache() doesn't care about old size since commit
    cedabed49b39 ("vfs: Fix vmtruncate() regression"). Let's drop it.

    Signed-off-by: Kirill A. Shutemov
    Cc: OGAWA Hirofumi
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kirill A. Shutemov
     
  • Pull vfs pile 4 from Al Viro:
    "list_lru pile, mostly"

    This came out of Andrew's pile, Al ended up doing the merge work so that
    Andrew didn't have to.

    Additionally, a few fixes.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (42 commits)
    super: fix for destroy lrus
    list_lru: dynamically adjust node arrays
    shrinker: Kill old ->shrink API.
    shrinker: convert remaining shrinkers to count/scan API
    staging/lustre/libcfs: cleanup linux-mem.h
    staging/lustre/ptlrpc: convert to new shrinker API
    staging/lustre/obdclass: convert lu_object shrinker to count/scan API
    staging/lustre/ldlm: convert to shrinkers to count/scan API
    hugepage: convert huge zero page shrinker to new shrinker API
    i915: bail out earlier when shrinker cannot acquire mutex
    drivers: convert shrinkers to new count/scan API
    fs: convert fs shrinkers to new scan/count API
    xfs: fix dquot isolation hang
    xfs-convert-dquot-cache-lru-to-list_lru-fix
    xfs: convert dquot cache lru to list_lru
    xfs: rework buffer dispose list tracking
    xfs-convert-buftarg-lru-to-generic-code-fix
    xfs: convert buftarg LRU to generic code
    fs: convert inode and dentry shrinking to be node aware
    vmscan: per-node deferred work
    ...

    Linus Torvalds
     
  • Pull NFS client bugfixes (part 2) from Trond Myklebust:
    "Bugfixes:
    - Fix a few credential reference leaks resulting from the
    SP4_MACH_CRED NFSv4.1 state protection code.
    - Fix the SUNRPC bloatometer footprint: convert a 256K hashtable into
    the intended 64 byte structure.
    - Fix a long standing XDR issue with FREE_STATEID
    - Fix a potential WARN_ON spamming issue
    - Fix a missing dprintk() kuid conversion

    New features:
    - Enable the NFSv4.1 state protection support for the WRITE and
    COMMIT operations"

    * tag 'nfs-for-3.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
    SUNRPC: No, I did not intend to create a 256KiB hashtable
    sunrpc: Add missing kuids conversion for printing
    NFSv4.1: sp4_mach_cred: WARN_ON -> WARN_ON_ONCE
    NFSv4.1: sp4_mach_cred: no need to ref count creds
    NFSv4.1: fix SECINFO* use of put_rpccred
    NFSv4.1: sp4_mach_cred: ask for WRITE and COMMIT
    NFSv4.1 fix decode_free_stateid

    Linus Torvalds
     
  • This avoids the spinlocks and refcounts in the d_path() sequence too
    (used by /proc and various other entities). See commit 8b19e34188a3 for
    the equivalent getcwd() system call path.

    And unlike getcwd(), d_path() doesn't copy the result to user space, so
    I don't need to fear _that_ particular bug happening again.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • It's a pathname. It should use the pathname allocators and
    deallocators, and PATH_MAX instead of PAGE_SIZE. Never mind that the
    two are commonly the same.

    With this, the allocations scale up nicely too, and I can do getcwd()
    system calls at a rate of about 300M/s, with no lock contention
    anywhere.

    Of course, nobody sane does that, especially since getcwd() is
    traditionally a very slow operation in Unix. But this was also the
    simplest way to benchmark the prepend_path() improvements by Waiman, and
    once I saw the profiles I couldn't leave it well enough alone.

    But apart from being an performance improvement (from using per-cpu slab
    allocators instead of the raw page allocator), it's actually a valid and
    real cleanup.

    Signed-off-by: Linus "OCD" Torvalds

    Linus Torvalds
     
  • Oops. That wasn't very smart. We don't actually need the RCU lock any
    more by the time we copy the cwd string to user space, but I had
    stupidly surrounded the whole thing with it.

    Introduced by commit 8b19e34188a3 ("vfs: make getcwd() get the root and
    pwd path under rcu")

    Is-a-big-hairy-idiot: Linus Torvalds

    Linus Torvalds
     
  • This allows us to skip all the crazy spinlocks and reference count
    updates, and instead use the fs sequence read-lock to get an atomic
    snapshot of the root and cwd information.

    We might want to make the rule that "prepend_path()" is always called
    with the RCU lock held, but the RCU lock nests fine and this is the
    minimal fix.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Let's not pollute the include files with inline functions that are only
    used in a single place. Especially not if we decide we might want to
    change the semantics of said function to make it more efficient..

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Pull btrfs updates from Chris Mason:
    "This is against 3.11-rc7, but was pulled and tested against your tree
    as of yesterday. We do have two small incrementals queued up, but I
    wanted to get this bunch out the door before I hop on an airplane.

    This is a fairly large batch of fixes, performance improvements, and
    cleanups from the usual Btrfs suspects.

    We've included Stefan Behren's work to index subvolume UUIDs, which is
    targeted at speeding up send/receive with many subvolumes or snapshots
    in place. It closes a long standing performance issue that was built
    in to the disk format.

    Mark Fasheh's offline dedup work is also here. In this case offline
    means the FS is mounted and active, but the dedup work is not done
    inline during file IO. This is a building block where utilities are
    able to ask the FS to dedup a series of extents. The kernel takes
    care of verifying the data involved really is the same. Today this
    involves reading both extents, but we'll continue to evolve the
    patches"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (118 commits)
    Btrfs: optimize key searches in btrfs_search_slot
    Btrfs: don't use an async starter for most of our workers
    Btrfs: only update disk_i_size as we remove extents
    Btrfs: fix deadlock in uuid scan kthread
    Btrfs: stop refusing the relocation of chunk 0
    Btrfs: fix memory leak of uuid_root in free_fs_info
    btrfs: reuse kbasename helper
    btrfs: return btrfs error code for dev excl ops err
    Btrfs: allow partial ordered extent completion
    Btrfs: convert all bug_ons in free-space-cache.c
    Btrfs: add support for asserts
    Btrfs: adjust the fs_devices->missing count on unmount
    Btrf: cleanup: don't check for root_refs == 0 twice
    Btrfs: fix for patch "cleanup: don't check the same thing twice"
    Btrfs: get rid of one BUG() in write_all_supers()
    Btrfs: allocate prelim_ref with a slab allocater
    Btrfs: pass gfp_t to __add_prelim_ref() to avoid always using GFP_ATOMIC
    Btrfs: fix race conditions in BTRFS_IOC_FS_INFO ioctl
    Btrfs: fix race between removing a dev and writing sbs
    Btrfs: remove ourselves from the cluster list under lock
    ...

    Linus Torvalds
     
  • This patch modifies read_seqbegin_or_lock() and need_seqretry() to use
    newly introduced read_seqlock_excl() and read_sequnlock_excl()
    primitives so that they won't change the sequence number even if they
    fall back to take the lock. This is OK as no change to the protected
    data structure is being made.

    It will prevent one fallback to lock taking from cascading into a series
    of lock taking reducing performance because of the sequence number
    change. It will also allow other sequence readers to go forward while
    an exclusive reader lock is taken.

    This patch also updates some of the inaccurate comments in the code.

    Signed-off-by: Waiman Long
    To: Alexander Viro
    Signed-off-by: Linus Torvalds

    Waiman Long
     

12 Sep, 2013

5 commits

  • Additional code in the error handler of xlog_recover_inode_pass2()
    results in the following error:

    static checker warning: "fs/xfs/xfs_log_recover.c:2999
    xlog_recover_inode_pass2()
    info: ignoring unreachable code."

    Reported-by: Dan Carpenter
    Signed-off-by: Mark Tinguely
    Reviewed-by: Ben Myers

    Mark Tinguely
     
  • There is a '=' vs '==' typo so the ASSERT()s are always true.

    Signed-off-by: Dan Carpenter
    Reviewed-by: Dave Chinner
    Reviewed-by: Eric Sandeen
    Signed-off-by: Ben Myers

    Dan Carpenter
     
  • Pull CIFS fixes from Steve French:
    "CIFS update including case insensitive file name matching improvements
    for UTF-8 to Unicode, various small cifs fixes, SMB2/SMB3 leasing
    improvements, support for following SMB2 symlinks, SMB3 packet signing
    improvements"

    * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: (25 commits)
    CIFS: Respect epoch value from create lease context v2
    CIFS: Add create lease v2 context for SMB3
    CIFS: Move parsing lease buffer to ops struct
    CIFS: Move creating lease buffer to ops struct
    CIFS: Store lease state itself rather than a mapped oplock value
    CIFS: Replace clientCanCache* bools with an integer
    [CIFS] quiet sparse compile warning
    cifs: Start using per session key for smb2/3 for signature generation
    cifs: Add a variable specific to NTLMSSP for key exchange.
    cifs: Process post session setup code in respective dialect functions.
    CIFS: convert to use le32_add_cpu()
    CIFS: Fix missing lease break
    CIFS: Fix a memory leak when a lease break comes
    cifs: add winucase_convert.pl to Documentation/ directory
    cifs: convert case-insensitive dentry ops to use new case conversion routines
    cifs: add new case-insensitive conversion routines that are based on wchar_t's
    [CIFS] Add Scott to list of cifs contributors
    cifs: Move and expand MAX_SERVER_SIZE definition
    cifs: Expand max share name length to 256
    cifs: Move string length definitions to uapi
    ...

    Linus Torvalds
     
  • …rnel/git/tyhicks/ecryptfs

    Pull eCryptfs fixes from Tyler Hicks:
    "Two small fixes to the code that initializes the per-file crypto
    contexts"

    * tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
    ecryptfs: avoid ctx initialization race
    ecryptfs: remove check for if an array is NULL

    Linus Torvalds
     
  • Merge first patch-bomb from Andrew Morton:
    - Some pidns/fork/exec tweaks
    - OCFS2 updates
    - Most of MM - there remain quite a few memcg parts which depend on
    pending core cgroups changes. Which might have been already merged -
    I'll check tomorrow...
    - Various misc stuff all over the place
    - A few block bits which I never got around to sending to Jens -
    relatively minor things.
    - MAINTAINERS maintenance
    - A small number of lib/ updates
    - checkpatch updates
    - epoll
    - firmware/dmi-scan
    - Some kprobes work for S390
    - drivers/rtc updates
    - hfsplus feature work
    - vmcore feature work
    - rbtree upgrades
    - AOE updates
    - pktcdvd cleanups
    - PPS
    - memstick
    - w1
    - New "inittmpfs" feature, which does the obvious
    - More IPC work from Davidlohr.

    * emailed patches from Andrew Morton : (303 commits)
    lz4: fix compression/decompression signedness mismatch
    ipc: drop ipc_lock_check
    ipc, shm: drop shm_lock_check
    ipc: drop ipc_lock_by_ptr
    ipc, shm: guard against non-existant vma in shmdt(2)
    ipc: document general ipc locking scheme
    ipc,msg: drop msg_unlock
    ipc: rename ids->rw_mutex
    ipc,shm: shorten critical region for shmat
    ipc,shm: cleanup do_shmat pasta
    ipc,shm: shorten critical region for shmctl
    ipc,shm: make shmctl_nolock lockless
    ipc,shm: introduce shmctl_nolock
    ipc: drop ipcctl_pre_down
    ipc,shm: shorten critical region in shmctl_down
    ipc,shm: introduce lockless functions to obtain the ipc object
    initmpfs: use initramfs if rootfstype= or root= specified
    initmpfs: make rootfs use tmpfs when CONFIG_TMPFS enabled
    initmpfs: move rootfs code from fs/ramfs/ to init/
    initmpfs: move bdi setup from init_rootfs to init_ramfs
    ...

    Linus Torvalds