diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 23:09:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-21 23:09:38 +0100 |
| commit | 93aaa830fc173560505c3411806509299d8871ce (patch) | |
| tree | e6e9e03d10fc35347d47414a90ff3973b05becbf /fs/btrfs/disk-io.c | |
| parent | Merge tag 'nfs-for-3.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | xfs: recall pNFS layouts on conflicting access (diff) | |
| download | linux-93aaa830fc173560505c3411806509299d8871ce.tar.xz linux-93aaa830fc173560505c3411806509299d8871ce.zip | |
Merge tag 'xfs-pnfs-for-linus-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs
Pull xfs pnfs block layout support from Dave Chinner:
"This contains the changes to XFS needed to support the PNFS block
layout server that you pulled in through Bruce's NFS server tree
merge.
I originally thought that I'd need to merge changes into the NFS
server side, but Bruce had already picked them up and so this is
purely changes to the fs/xfs/ codebase.
Summary:
This update contains the implementation of the PNFS server export
methods that enable use of XFS filesystems as a block layout target"
* tag 'xfs-pnfs-for-linus-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs:
xfs: recall pNFS layouts on conflicting access
xfs: implement pNFS export operations
Diffstat (limited to 'fs/btrfs/disk-io.c')
0 files changed, 0 insertions, 0 deletions