Commit 3cc50ac0dbda5100684e570247782330155d35e0
Exists in
master
and in
4 other branches
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-fscache
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-fscache: (41 commits) NFS: Add mount options to enable local caching on NFS NFS: Display local caching state NFS: Store pages from an NFS inode into a local cache NFS: Read pages from FS-Cache into an NFS inode NFS: nfs_readpage_async() needs to be accessible as a fallback for local caching NFS: Add read context retention for FS-Cache to call back with NFS: FS-Cache page management NFS: Add some new I/O counters for FS-Cache doing things for NFS NFS: Invalidate FsCache page flags when cache removed NFS: Use local disk inode cache NFS: Define and create inode-level cache objects NFS: Define and create superblock-level objects NFS: Define and create server-level objects NFS: Register NFS for caching and retrieve the top-level index NFS: Permit local filesystem caching to be enabled for NFS NFS: Add FS-Cache option bit and debug bit NFS: Add comment banners to some NFS functions FS-Cache: Make kAFS use FS-Cache CacheFiles: A cache that backs onto a mounted filesystem CacheFiles: Export things for CacheFiles ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 82 changed files Side-by-side Diff
- Documentation/filesystems/caching/backend-api.txt
- Documentation/filesystems/caching/cachefiles.txt
- Documentation/filesystems/caching/fscache.txt
- Documentation/filesystems/caching/netfs-api.txt
- Documentation/filesystems/caching/object.txt
- Documentation/filesystems/caching/operations.txt
- Documentation/slow-work.txt
- fs/Kconfig
- fs/Makefile
- fs/afs/Kconfig
- fs/afs/Makefile
- fs/afs/cache.c
- fs/afs/cache.h
- fs/afs/cell.c
- fs/afs/file.c
- fs/afs/inode.c
- fs/afs/internal.h
- fs/afs/main.c
- fs/afs/mntpt.c
- fs/afs/vlocation.c
- fs/afs/volume.c
- fs/afs/write.c
- fs/cachefiles/Kconfig
- fs/cachefiles/Makefile
- fs/cachefiles/bind.c
- fs/cachefiles/daemon.c
- fs/cachefiles/interface.c
- fs/cachefiles/internal.h
- fs/cachefiles/key.c
- fs/cachefiles/main.c
- fs/cachefiles/namei.c
- fs/cachefiles/proc.c
- fs/cachefiles/rdwr.c
- fs/cachefiles/security.c
- fs/cachefiles/xattr.c
- fs/fscache/Kconfig
- fs/fscache/Makefile
- fs/fscache/cache.c
- fs/fscache/cookie.c
- fs/fscache/fsdef.c
- fs/fscache/histogram.c
- fs/fscache/internal.h
- fs/fscache/main.c
- fs/fscache/netfs.c
- fs/fscache/object.c
- fs/fscache/operation.c
- fs/fscache/page.c
- fs/fscache/proc.c
- fs/fscache/stats.c
- fs/nfs/Kconfig
- fs/nfs/Makefile
- fs/nfs/client.c
- fs/nfs/file.c
- fs/nfs/fscache-index.c
- fs/nfs/fscache.c
- fs/nfs/fscache.h
- fs/nfs/inode.c
- fs/nfs/internal.h
- fs/nfs/iostat.h
- fs/nfs/read.c
- fs/nfs/super.c
- fs/splice.c
- fs/super.c
- include/linux/fscache-cache.h
- include/linux/fscache.h
- include/linux/nfs_fs.h
- include/linux/nfs_fs_sb.h
- include/linux/nfs_iostat.h
- include/linux/page-flags.h
- include/linux/pagemap.h
- include/linux/slow-work.h
- init/Kconfig
- kernel/Makefile
- kernel/slow-work.c
- kernel/sysctl.c
- mm/filemap.c
- mm/migrate.c
- mm/readahead.c
- mm/swap.c
- mm/truncate.c
- mm/vmscan.c
- security/security.c