summaryrefslogtreecommitdiff
path: root/bpfc
diff options
context:
space:
mode:
Diffstat (limited to 'bpfc')
0 files changed, 0 insertions, 0 deletions
='/cgit.cgi/linux/net-next.git/diff/?id=2883aaea363f7a897ff06d2e6c73ae7aae285bcb&id2=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
Diffstat
-rw-r--r--fs/fscache/cookie.c5
-rw-r--r--fs/fscache/netfs.c1
-rw-r--r--fs/fscache/object.c32
-rw-r--r--include/linux/fscache-cache.h1
4 files changed, 37 insertions, 2 deletions
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c