aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
Commit message (Expand)AuthorAgeFilesLines
* Revert "fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)"Linus Torvalds2009-12-171-0/+8
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/v...Linus Torvalds2009-12-161-8/+0
|\
| * fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)Al Viro2009-12-161-8/+0
* | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2009-12-163-73/+195
|\ \
| * | NFSv4: Fix a regression in the NFSv4 state managerTrond Myklebust2009-12-151-3/+2
| * | NFSv4: Release the sequence id before restarting a CLOSE rpc callTrond Myklebust2009-12-153-6/+11
| * | nfs41: fix session fore channel negotiationAndy Adamson2009-12-151-2/+10
| * | nfs41: do not zero seqid portion of stateid on closeAndy Adamson2009-12-151-2/+0
| * | nfs: run state manager in privileged modeAlexandros Batsakis2009-12-152-21/+16
| * | nfs: make recovery state manager operations privilegedAlexandros Batsakis2009-12-151-18/+97
| * | nfs: enforce FIFO ordering of operations trying to acquire slotAlexandros Batsakis2009-12-152-6/+34
| * | nfs: remove rpc_task argument from nfs4_find_slotAlexandros Batsakis2009-12-151-2/+2
| * | nfs: change nfs4_do_setlk params to identify recovery typeAlexandros Batsakis2009-12-152-7/+11
| * | nfs: do not do a LOOKUP after openAlexandros Batsakis2009-12-151-3/+0
| * | nfs: minor cleanup of session drainingAlexandros Batsakis2009-12-151-9/+18
| |/
* | Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2009-12-161-1/+1
|\ \ | |/ |/|
| * Merge commit 'v2.6.32-rc8' into HEADJ. Bruce Fields2009-11-235-9/+13
| |\
| * | nfs: new subdir Documentation/filesystems/nfsJ. Bruce Fields2009-10-271-1/+1
* | | Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2009-12-1418-408/+898
|\ \ \
| * \ \ Merge branch 'nfs-for-2.6.33'Trond Myklebust2009-12-1318-408/+898
| |\ \ \
| | * | | NFS: Fix nfs_migrate_page()Trond Myklebust2009-12-101-2/+3
| | * | | nfs41: Invoke RECLAIM_COMPLETE on all new client idsRicardo Labiaga2009-12-081-3/+4
| | * | | NFSv41: Fix a potential state leakage when restarting nfs4_close_prepareTrond Myklebust2009-12-081-17/+35
| | * | | nfs41: Handle NFSv4.1 session errors in the delegation recall codeRicardo Labiaga2009-12-071-0/+5
| | * | | nfs41: Retry delegation return if it failed with session errorRicardo Labiaga2009-12-071-2/+13
| | * | | nfs41: Handle session errors during delegation returnRicardo Labiaga2009-12-071-0/+8
| | * | | nfs41: Mark stateids in need of reclaim if state manager gets stale clientidRicardo Labiaga2009-12-071-10/+2
| | * | | NFS: Fix up the declaration of nfs4_restart_rpc when NFSv4 not configuredTrond Myklebust2009-12-075-22/+22
| | * | | nfs41: Don't clear DRAINING flag on NFS4ERR_STALE_CLIENTIDRicardo Labiaga2009-12-062-18/+43
| | * | | nfs41: nfs41_setup_state_renewalRicardo Labiaga2009-12-063-18/+31
| | * | | NFSv41: More cleanupsTrond Myklebust2009-12-051-4/+3
| | * | | NFSv41: Fix up some bugs in the NFS4CLNT_SESSION_DRAINING codeTrond Myklebust2009-12-052-11/+10
| | * | | NFSv41: Clean up slot table managementTrond Myklebust2009-12-055-82/+21
| | * | | NFSv41: Fix nfs4_proc_create_sessionTrond Myklebust2009-12-053-39/+27
| | * | | nfs41: Invoke RECLAIM_COMPLETERicardo Labiaga2009-12-051-0/+3
| | * | | nfs41: RECLAIM_COMPLETE functionalityRicardo Labiaga2009-12-053-0/+114
| | * | | nfs41: RECLAIM_COMPLETE XDR functionalityRicardo Labiaga2009-12-051-0/+66
| | * | | Cleanup some NFSv4 XDR decode commentsRicardo Labiaga2009-12-051-13/+13
| | * | | NFSv41: nfs4_reset_session must always set NFS4CLNT_SESSION_DRAININGTrond Myklebust2009-12-051-1/+1
| | * | | nfs41: v2 fix cb_recall bugAlexandros Batsakis2009-12-054-7/+48
| | * | | nfs41: check SEQUENCE status flagAlexandros Batsakis2009-12-054-2/+27
| | * | | nfs41: V2 adjust max_rqst_sz, max_resp_sz w.r.t to rsize, wsizeAlexandros Batsakis2009-12-054-4/+35
| | * | | nfs41: remove server-only EXCHGID4_FLAG_CONFIRMED_R flag from exchange_idAlexandros Batsakis2009-12-051-0/+3
| | * | | nfs41: add support for the exclusive create flagsAlexandros Batsakis2009-12-052-6/+29
| | * | | nfs41: check if session exists and if it is persistentAlexandros Batsakis2009-12-051-0/+9
| | * | | nfs41: V2 initial support for CB_RECALL_ANYAlexandros Batsakis2009-12-055-2/+68
| | * | | nfs4: V2 return/expire delegations depending on their typeAlexandros Batsakis2009-12-051-4/+18
| | * | | nfs4: minor delegation cleaningAlexandros Batsakis2009-12-051-4/+2
| | * | | nfs41: add support for callback with RPC version number 4Alexandros Batsakis2009-12-054-0/+10
| | * | | nfs41: only state manager sets NFS4CLNT_SESSION_SETUPAndy Adamson2009-12-042-4/+6
generated by cgit v1.1 at 2024-11-01 04:44:18 +0000