1. 22 Feb, 2013 36 commits
  2. 21 Feb, 2013 4 commits
    • Linus Torvalds's avatar
      Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 024e4ec1
      Linus Torvalds authored
      Pull pstore patches from Tony Luck:
       "A few fixes to reduce places where pstore might hang a system in the
        crash path.  Plus a new mountpoint (/sys/fs/pstore ...  makes more
        sense then /dev/pstore)."
      
      Fix up trivial conflict in drivers/firmware/efivars.c
      
      * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore: Create a convenient mount point for pstore
        efi_pstore: Introducing workqueue updating sysfs
        efivars: Disable external interrupt while holding efivars->lock
        efi_pstore: Avoid deadlock in non-blocking paths
        pstore: Avoid deadlock in panic and emergency-restart path
      024e4ec1
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 850cb82b
      Linus Torvalds authored
      Pull dlm update from David Teigland:
       "This includes a single patch to avoid excessive and unnecessary
        scanning of rsbs to free."
      
      * tag 'dlm-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: avoid scanning unchanged toss lists
      850cb82b
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 2171ee8f
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
      
       - Fix an Oops in the pNFS layoutget code
      
       - Fix a number of NFSv4 and v4.1 state recovery deadlocks and hangs due
         to the interaction of the session drain lock and state management
         locks.
      
       - Remove task->tk_xprt, which was hiding a lot of RCU dereferencing
         bugs
      
       - Fix a long standing NFSv3 posix lock recovery bug.
      
       - Revert commit 324d003b ("NFS: add nfs_sb_deactive_async to avoid
         deadlock").  It turned out that the root cause of the deadlock was
         due to interactions with the workqueues that have now been resolved.
      
      * tag 'nfs-for-3.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (22 commits)
        NLM: Ensure that we resend all pending blocking locks after a reclaim
        umount oops when remove blocklayoutdriver first
        sunrpc: silence build warning in gss_fill_context
        nfs: remove kfree() redundant null checks
        NFSv4.1: Don't decode skipped layoutgets
        NFSv4.1: Fix bulk recall and destroy of layouts
        NFSv4.1: Fix an ABBA locking issue with session and state serialisation
        NFSv4: Fix a reboot recovery race when opening a file
        NFSv4: Ensure delegation recall and byte range lock removal don't conflict
        NFSv4: Fix up the return values of nfs4_open_delegation_recall
        NFSv4.1: Don't lose locks when a server reboots during delegation return
        NFSv4.1: Prevent deadlocks between state recovery and file locking
        NFSv4: Allow the state manager to mark an open_owner as being recovered
        SUNRPC: Add missing static declaration to _gss_mech_get_by_name
        Revert "NFS: add nfs_sb_deactive_async to avoid deadlock"
        SUNRPC: Nuke the tk_xprt macro
        SUNRPC: Avoid RCU dereferences in the transport bind and connect code
        SUNRPC: Fix an RCU dereference in xprt_reserve
        SUNRPC: Pass pointers to struct rpc_xprt to the congestion window
        SUNRPC: Fix an RCU dereference in xs_local_rpcbind
        ...
      2171ee8f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · 9b9a72a8
      Linus Torvalds authored
      Pull GFS2 updates from Steven Whitehouse:
       "This is one of the smallest collections of patches for the merge
        window for some time.  There are some clean ups relating to the
        transaction code and the shrinker, which are mostly in preparation for
        further development, but also make the code much easier to follow in
        these areas.
      
        There is a patch which allows the use of ->writepages even in the
        default ordered write mode for all writebacks.  This results in
        sending larger i/os to the block layer, and a subsequent increase in
        performance.  It also reduces the number of different i/o paths by
        one.
      
        There is also a bug fix reinstating the withdraw ack system which
        somehow got lost when the lock modules were merged into GFS2."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Reinstate withdraw ack system
        GFS2: Get a block reservation before resizing a file
        GFS2: Split glock lru processing into two parts
        GFS2: Use ->writepages for ordered writes
        GFS2: Clean up freeze code
        GFS2: Merge gfs2_attach_bufdata() into trans.c
        GFS2: Copy gfs2_trans_add_bh into new data/meta functions
        GFS2: Split gfs2_trans_add_bh() into two
        GFS2: Merge revoke adding functions
        GFS2: Separate LRU scanning from shrinker
      9b9a72a8