summaryrefslogtreecommitdiff
path: root/fs/nfs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2016-01-236-32/+32
|\
| * wrappers for ->i_mutex accessAl Viro2016-01-226-32/+32
* | Merge tag 'nfs-for-4.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2016-01-235-69/+47
|\ \ | |/ |/|
| * Merge branch 'bugfixes'Trond Myklebust2016-01-222-63/+42
| |\
| | * pNFS/flexfiles: Fix an XDR encoding bug in layoutreturnTrond Myklebust2016-01-221-4/+2
| | * pNFS/flexfiles: Improve merging of errors in LAYOUTRETURNTrond Myklebust2016-01-211-59/+40
| * | NFS: Simplify nfs_request_add_commit_list() argumentsAnna Schumaker2016-01-213-6/+5
* | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2016-01-151-1/+1
|\ \ \
| * | | kmemcg: account certain kmem allocations to memcgVladimir Davydov2016-01-141-1/+1
* | | | Merge tag 'nfs-for-4.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2016-01-1422-417/+1148
|\ \ \ \ | | |/ / | |/| |
| * | | NFS: Fix a compile warning about unused variable in nfs_generic_pg_pgios()Trond Myklebust2016-01-081-3/+0
| * | | NFSv4: Fix a compile warning about no prototype for nfs4_ioctl()Trond Myklebust2016-01-081-1/+1
| * | | Merge branch 'bugfixes'Trond Myklebust2016-01-077-25/+92
| |\ \ \ | | | |/ | | |/|
| | * | pNFS/flexfiles: Fix an Oopsable typo in ff_mirror_match_fh()Trond Myklebust2015-12-301-1/+1
| | * | NFS: Fix attribute cache revalidationTrond Myklebust2015-12-301-15/+39
| | * | NFS: Ensure we revalidate attributes before using execute_ok()Trond Myklebust2015-12-281-2/+16
| | * | NFS: Flush reclaim writes using FLUSH_COND_STABLETrond Myklebust2015-12-281-1/+1
| | * | NFS: Background flush should not be low priorityTrond Myklebust2015-12-281-2/+0
| | * | NFSv4.1/pnfs: Fixup an lo->plh_block_lgets imbalance in layoutreturnTrond Myklebust2015-12-281-1/+0
| | * | NFSv4: Don't perform cached access checks before we've OPENed the fileTrond Myklebust2015-12-281-0/+3
| | * | NFS: Allow the combination pNFS and labeled NFSTrond Myklebust2015-12-281-0/+3
| | * | NFS42: handle layoutstats stateid errorPeng Tao2015-12-281-2/+27
| | * | nfs: Fix race in __update_open_stateid()Andrew Elble2015-12-281-1/+1
| | * | nfs: fix missing assignment in nfs4_sequence_done tracepointAndrew Elble2015-12-281-0/+1
| * | | NFS: Use wait_on_atomic_t() for unlock after readaheadBenjamin Coddington2016-01-075-63/+22
| * | | Merge branch 'pnfs_generic'Trond Myklebust2016-01-0413-115/+293
| |\ \ \
| | * | | NFSv4.1/pNFS: Cleanup constify struct pnfs_layout_range argumentsTrond Myklebust2016-01-042-6/+6
| | * | | NFSv4.1/pnfs: Cleanup copying of pnfs_layout_range structuresTrond Myklebust2016-01-042-2/+9
| | * | | NFSv4.1/pNFS: Cleanup pnfs_mark_matching_lsegs_invalid()Trond Myklebust2016-01-041-5/+5
| | * | | NFSv4.1/pNFS: Fix a race in initiate_file_draining()Trond Myklebust2016-01-041-4/+1
| | * | | NFSv4.1/pNFS: pnfs_error_mark_layout_for_return() must always return layoutTrond Myklebust2016-01-042-7/+21
| | * | | NFSv4.1/pNFS: pnfs_mark_matching_lsegs_return() should set the iomodeTrond Myklebust2016-01-041-4/+12
| | * | | NFSv4.1/pNFS: Use nfs4_stateid_copy for copying stateidsTrond Myklebust2016-01-041-3/+3
| | * | | NFSv4.1/pNFS: Don't pass stateids by value to pnfs_send_layoutreturn()Trond Myklebust2016-01-041-6/+6
| | * | | NFS: Relax requirements in nfs_flush_incompatibleTrond Myklebust2015-12-313-7/+8
| | * | | NFSv4.1/pNFS: Don't queue up a new commit if the layout segment is invalidTrond Myklebust2015-12-316-0/+37
| | * | | NFS: Allow multiple commit requests in flight per fileTrond Myklebust2015-12-315-49/+35
| | * | | NFS/pNFS: Fix up pNFS write reschedule layering violations and bugsTrond Myklebust2015-12-314-19/+22
| | * | | NFSv4: List stateid information in the callback tracepointsTrond Myklebust2015-12-282-6/+79
| | * | | NFSv4.1/pNFS: Don't return NFS4ERR_DELAY unnecessarily in CB_LAYOUTRECALLTrond Myklebust2015-12-281-1/+1
| | * | | NFSv4.1/pNFS: Ensure we enforce RFC5661 Section 12.5.5.2.1Trond Myklebust2015-12-281-0/+20
| | * | | pNFS: If we have to delay the layout callback, mark the layout for returnTrond Myklebust2015-12-283-3/+18
| | * | | NFSv4.1/pNFS: Add a helper to mark the layout as returnedTrond Myklebust2015-12-284-1/+17
| | * | | pNFS: Ensure nfs4_layoutget_prepare returns the correct errorTrond Myklebust2015-12-281-4/+5
| * | | | Merge branch 'flexfiles'Trond Myklebust2015-12-2814-174/+339
| |\ \ \ \
| | * | | | pNFS/flexfiles: Ensure we record layoutstats even if RPC is terminated earlyTrond Myklebust2015-12-281-6/+31
| | * | | | pNFS: Add flag to track if we've called nfs4_ff_layout_stat_io_start_read/writeTrond Myklebust2015-12-281-25/+70
| | * | | | pNFS/flexfiles: Fix a statistics gathering imbalanceTrond Myklebust2015-12-281-1/+1
| | * | | | pNFS/flexfiles: Don't mark the entire layout as failed, when returning itTrond Myklebust2015-12-282-3/+1
| | * | | | pNFS/flexfiles: Don't prevent flexfiles client from retrying LAYOUTGETTrond Myklebust2015-12-284-53/+6
View Lorry Controller Status