From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Jul 2018 17:55:24 +0000 (-0700)
Subject: Merge tag 'fscache-fixes-20180725' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~8389
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c61ef1b7c18f2b737cc2abd6cba32b45383a9a8;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'fscache-fixes-20180725' of git://git./linux/kernel/git/dhowells/linux-fs

Pull fscache/cachefiles fixes from David Howells:

 - Allow cancelled operations to be queued so they can be cleaned up.

 - Fix a refcounting bug in the monitoring of reads on backend files
   whereby a race can occur between monitor objects being listed for
   work, the work processing being queued and the work processor running
   and destroying the monitor objects.

 - Fix a ref overput in object attachment, whereby a tentatively
   considered object is put in error handling without first being 'got'.

 - Fix a missing clear of the CACHEFILES_OBJECT_ACTIVE flag whereby an
   assertion occurs when we retry because it seems the object is now
   active.

 - Wait rather BUG'ing on an object collision in the depths of
   cachefiles as the active object should be being cleaned up - also
   depends on the one above.

* tag 'fscache-fixes-20180725' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  cachefiles: Wait rather than BUG'ing on "Unexpected object collision"
  cachefiles: Fix missing clear of the CACHEFILES_OBJECT_ACTIVE flag
  fscache: Fix reference overput in fscache_attach_object() error handling
  cachefiles: Fix refcounting bug in backing-file read monitoring
  fscache: Allow cancelled operations to be enqueued
---

5c61ef1b7c18f2b737cc2abd6cba32b45383a9a8