diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-01 10:30:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-01 10:30:56 -0800 |
| commit | 2883aaea363f7a897ff06d2e6c73ae7aae285bcb (patch) | |
| tree | c4b53cd7231612df4a3b1ac190d205f6618bdbcd | |
| parent | e387dc122fc7c70c2a5df2567f4e2d1114f5a5da (diff) | |
| parent | e26bfebdfc0d212d366de9990a096665d5c0209a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull fscache fixes from Al Viro.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fscache: Fix dead object requeue
fscache: Clear outstanding writes when disabling a cookie
FS-Cache: Initialise stores_lock in netfs cookie
| -rw-r--r-- | fs/fscache/cookie.c | 5 | ||||
| -rw-r--r-- | fs/fscache/netfs.c | 1 | ||||
| -rw-r--r-- | fs/fscache/object.c | 32 | ||||
| -rw-r--r-- | include/linux/fscache-cache.h | 1 |
4 files changed, 37 insertions, 2 deletions
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c |