summaryrefslogtreecommitdiffstats
path: root/fs/nfs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.20/bdi' of git://git.kernel.dk/linux-blockLinus Torvalds2015-02-127-26/+11
|\
| * nfs: don't call bdi_unregisterChristoph Hellwig2015-01-203-20/+6
| * fs: remove mapping->backing_dev_infoChristoph Hellwig2015-01-201-1/+0
| * fs: export inode_to_bdi and use it in favor of mapping->backing_dev_infoChristoph Hellwig2015-01-202-4/+4
* | Merge tag 'nfs-for-3.20-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2015-02-1137-1183/+4528
|\ \
| * | pnfs: delete an unintended gotoDan Carpenter2015-02-101-1/+0
| * | pnfs/flexfiles: Do not dprintk after the freeTom Haynes2015-02-091-1/+1
| * | NFSv4.1: Fix pnfs_put_lseg racesTrond Myklebust2015-02-051-34/+19
| * | NFSv4.1: pnfs_send_layoutreturn should use GFP_NOFSTrond Myklebust2015-02-051-1/+1
| * | NFSv4.1: Pin the inode and super block in asynchronous layoutreturnsTrond Myklebust2015-02-051-8/+11
| * | NFSv4.1: Pin the inode and super block in asynchronous layoutcommitTrond Myklebust2015-02-051-8/+11
| * | NFSv4: Ensure we reference the inode for return-on-close in delegreturnTrond Myklebust2015-02-053-9/+36
| * | NFSv4.1: Ask for no delegation on OPEN if using O_DIRECTTrond Myklebust2015-02-042-26/+83
| * | Merge branch 'flexfiles'Trond Myklebust2015-02-0331-1020/+4206
| |\ \
| | * | pnfs: lookup new lseg at lseg boundaryWeston Andros Adamson2015-02-031-2/+8
| | * | nfs41: .init_read and .init_write can be called with valid pg_lsegPeng Tao2015-02-031-21/+20
| | * | pnfs/flexfiles: Add the FlexFile Layout DriverTom Haynes2015-02-0310-12/+2320
| | * | nfs: count DIO good bytes correctly with mirroringPeng Tao2015-02-031-4/+8
| | * | nfs41: wait for LAYOUTRETURN before retrying LAYOUTGETPeng Tao2015-02-033-3/+45
| | * | nfs: add a helper to set NFS_ODIRECT_RESCHED_WRITES to direct writesPeng Tao2015-02-032-0/+7
| | * | nfs41: add NFS_LAYOUT_RETRY_LAYOUTGET to layout header flagsPeng Tao2015-02-032-0/+21
| | * | nfs/flexfiles: send layoutreturn before freeing lsegPeng Tao2015-02-031-25/+56
| | * | nfs41: introduce NFS_LAYOUT_RETURN_BEFORE_CLOSEPeng Tao2015-02-033-7/+36
| | * | nfs41: allow async version layoutreturnPeng Tao2015-02-033-8/+16
| | * | nfs41: add range to layoutreturn argsPeng Tao2015-02-032-4/+6
| | * | pnfs: allow LD to ask to resend read through pnfsPeng Tao2015-02-032-1/+16
| | * | nfs: add nfs_pgio_current_mirror helperPeng Tao2015-02-034-14/+24
| | * | nfs: only reset desc->pg_mirror_idx when mirroring is supportedPeng Tao2015-02-032-4/+11
| | * | nfs41: add a debug warning if we destroy an unempty layoutPeng Tao2015-02-031-0/+2
| | * | pnfs: fail comparison when bucket verifier not setWeston Andros Adamson2015-02-031-1/+5
| | * | nfs: mirroring support for direct ioWeston Andros Adamson2015-02-031-14/+57
| | * | nfs: add mirroring support to pgio layerWeston Andros Adamson2015-02-037-64/+293
| | * | pnfs: pass ds_commit_idx through the commit pathWeston Andros Adamson2015-02-036-17/+24
| | * | nfs: rename pgio header ds_idx to ds_commit_idxWeston Andros Adamson2015-02-032-10/+8
| | * | nfs: handle overlapping reqs in lock_and_joinWeston Andros Adamson2015-02-031-6/+11
| | * | pnfs: release lseg in pnfs_generic_pg_cleanupWeston Andros Adamson2015-02-035-18/+21
| | * | nfs: introduce pg_cleanup op for pgio descriptorsWeston Andros Adamson2015-02-031-1/+4
| | * | nfs/filelayout: use pnfs_error_mark_layout_for_returnPeng Tao2015-02-032-11/+1
| | * | nfs41: clear NFS_LAYOUT_RETURN if layoutreturn is sent or failed to sendPeng Tao2015-02-032-0/+6
| | * | nfs41: send layoutreturn in last put_lsegPeng Tao2015-02-031-1/+37
| | * | nfs41: don't use a layout if it is marked for returningPeng Tao2015-02-033-5/+20
| | * | nfs41: add a helper to mark layout for returnPeng Tao2015-02-032-0/+59
| | * | nfs41: make a helper function to send layoutreturnPeng Tao2015-02-031-20/+33
| | * | nfs41: pass iomode through layoutreturn argsPeng Tao2015-02-032-1/+2
| | * | nfs: save server READ/WRITE/COMMIT statusPeng Tao2015-02-033-3/+13
| | * | nfs41: serialize first layoutget of a filePeng Tao2015-02-032-4/+32
| | * | nfs41: close a small race window when adding new layout to global listPeng Tao2015-02-031-5/+3
| | * | nfs/flexclient: export pnfs_layoutcommit_inodePeng Tao2015-02-031-0/+1
| | * | nfs: set hostname when creating nfsv3 ds connectionPeng Tao2015-02-031-0/+7
| | * | NFSv4.1/NFSv3: Add pNFS callbacks for nfs3_(read|write|commit)_done()Trond Myklebust2015-02-031-0/+9