• L
    Merge tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs · bcd7351e
    Linus Torvalds 提交于
    Pull FS-Cache updates from David Howells:
     "This contains a number of fixes for various FS-Cache issues plus some
      cleanups.  The commits are, in order:
    
       1) Provide a system wait_on_atomic_t() and wake_up_atomic_t() sharing
          the bit-wait table (enhancement for #8).
    
       2) Don't put spin_lock() in a while-condition as spin_lock() may have
          a do {} while(0) wrapper (cleanup).
    
       3) Symbolically name i_mutex lock classes rather than using numbers
          in CacheFiles (cleanup).
    
       4) Don't sleep in page release if __GFP_FS is not set (deadlock vs
          ext4).
    
       5) Uninline fscache_object_init() (cleanup for #7).
    
       6) Wrap checks on object state (cleanup for #7).
    
       7) Simplify the object state machine by separating work states from
          wait states.
    
       8) Simplify cookie retention by objects (NULL pointer deref fix).
    
       9) Remove unused list_to_page() macro (cleanup).
    
      10) Make the remaining-pages counter in the retrieval op atomic
          (assertion failure fix).
    
      11) Don't use spin_is_locked() in assertions (assertion failure fix)"
    
    * tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
      FS-Cache: Don't use spin_is_locked() in assertions
      FS-Cache: The retrieval remaining-pages counter needs to be atomic_t
      cachefiles: remove unused macro list_to_page()
      FS-Cache: Simplify cookie retention for fscache_objects, fixing oops
      FS-Cache: Fix object state machine to have separate work and wait states
      FS-Cache: Wrap checks on object state
      FS-Cache: Uninline fscache_object_init()
      FS-Cache: Don't sleep in page release if __GFP_FS is not set
      CacheFiles: name i_mutex lock class explicitly
      fs/fscache: remove spin_lock() from the condition in while()
      Add wait_on_atomic_t() and wake_up_atomic_t()
    bcd7351e
wait.h 29.9 KB