aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
Commit message (Expand)AuthorAge
* Merge branch 'akpm' (patches from Andrew Morton)Linus Torvalds2013-09-12
|\
| * truncate: drop 'oldsize' truncate_pagecache() parameterKirill A. Shutemov2013-09-12
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2013-09-12
|\ \
| * | fs: convert fs shrinkers to new scan/count APIDave Chinner2013-09-10
| * | super: fix calculation of shrinkable objects for small numbersGlauber Costa2013-09-10
| |/
* | Merge tag 'nfs-for-3.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2013-09-12
|\ \ | |/ |/|
| * NFSv4.1: sp4_mach_cred: WARN_ON -> WARN_ON_ONCEWeston Andros Adamson2013-09-11
| * NFSv4.1: sp4_mach_cred: no need to ref count credsWeston Andros Adamson2013-09-11
| * NFSv4.1: fix SECINFO* use of put_rpccredWeston Andros Adamson2013-09-11
| * NFSv4.1: sp4_mach_cred: ask for WRITE and COMMITWeston Andros Adamson2013-09-11
| * NFSv4.1 fix decode_free_stateidAndy Adamson2013-09-10
* | Merge tag 'nfs-for-3.12-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2013-09-09
|\|
| * NFSv4: use mach cred for SECINFO_NO_NAME w/ integrityWeston Andros Adamson2013-09-07
| * NFS: nfs_compare_super shouldn't check the auth flavour unless 'sec=' was setTrond Myklebust2013-09-07
| * NFSv4: Allow security autonegotiation for submountsTrond Myklebust2013-09-07
| * NFSv4: Disallow security negotiation for lookups when 'sec=' is specifiedTrond Myklebust2013-09-07
| * NFSv4: Fix security auto-negotiationTrond Myklebust2013-09-07
| * NFS: Clean up nfs_parse_security_flavors()Trond Myklebust2013-09-07
| * NFS: Clean up the auth flavour array messTrond Myklebust2013-09-07
| * NFSv4.1 Use MDS auth flavor for data server connectionAndy Adamson2013-09-06
| * NFS: Don't check lock owner compatability unless file is locked (part 2)Trond Myklebust2013-09-06
| * NFS: Don't check lock owner compatibility in writes unless file is lockedTrond Myklebust2013-09-05
| * nfs4: Map NFS4ERR_WRONG_CRED to EPERMWeston Andros Adamson2013-09-05
| * nfs4.1: Add SP4_MACH_CRED write and commit supportWeston Andros Adamson2013-09-05
| * nfs4.1: Add SP4_MACH_CRED stateid supportWeston Andros Adamson2013-09-05
| * nfs4.1: Add SP4_MACH_CRED secinfo supportWeston Andros Adamson2013-09-05
| * nfs4.1: Add SP4_MACH_CRED cleanup supportWeston Andros Adamson2013-09-05
| * nfs4.1: Add state protection handlerWeston Andros Adamson2013-09-05
| * nfs4.1: Minimal SP4_MACH_CRED implementationWeston Andros Adamson2013-09-05
| * NFSv4: Document the recover_lost_locks kernel parameterTrond Myklebust2013-09-04
| * NFSv4: Don't try to recover NFSv4 locks when they are lost.NeilBrown2013-09-04
| * NFS: Fix warning introduced by NFSv4.0 transport blocking patchesChuck Lever2013-09-04
| * When CONFIG_NFS_V4_1 is not enabled, "make C=2" emits this warning:Chuck Lever2013-09-04
| * NFS: Update session draining barriers for NFSv4.0 transport blockingChuck Lever2013-09-03
| * NFS: Add nfs4_sequence calls for OPEN_CONFIRMChuck Lever2013-09-03
| * NFS: Add nfs4_sequence calls for RELEASE_LOCKOWNERChuck Lever2013-09-03
| * NFS: Enable nfs4_setup_sequence() for DELEGRETURNChuck Lever2013-09-03
| * NFS: NFSv4.0 transport blockingChuck Lever2013-09-03
| * NFS: Add a slot table to struct nfs_client for NFSv4.0 transport blockingChuck Lever2013-09-03
| * NFS: Add global helper for releasing slot table resourcesChuck Lever2013-09-03
| * NFS: Add global helper to set up a stand-along nfs4_slot_tableChuck Lever2013-09-03
| * NFS: Enable slot table helpers for NFSv4.0Chuck Lever2013-09-03
| * NFS: Remove unused call_sync minor version opChuck Lever2013-09-03
| * NFS: Add RPC callouts to start NFSv4.0 synchronous requestsChuck Lever2013-09-03
| * NFS: Common versions of sequence helper functionsChuck Lever2013-09-03
| * NFS: Clean up nfs4_setup_sequence()Chuck Lever2013-09-03
| * NFS: Rename nfs41_call_sync_data as a common data structureChuck Lever2013-09-03
| * NFS: When displaying session slot numbers, use "%u" consistentlyChuck Lever2013-09-03
| * NFS: Ensure that rmdir() waits for sillyrenames to completeTrond Myklebust2013-09-03
| * NFSv4: use the mach cred for SECINFO w/ integrityWeston Andros Adamson2013-09-03