summaryrefslogtreecommitdiffstats
path: root/fs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-07-3111-83/+156
|\
| * nfs: prevent page allocator recursions with swap over NFS.Mel Gorman2012-07-312-3/+3
| * nfs: enable swap on NFSMel Gorman2012-07-313-30/+82
| * nfs: disable data cache revalidation for swapfilesMel Gorman2012-07-312-14/+39
| * nfs: teach the NFS client how to treat PG_swapcache pagesMel Gorman2012-07-315-28/+29
| * vmscan: remove obsolete shrink_control commentMinchan Kim2012-07-311-1/+1
| * hugetlb: use mmu_gather instead of a temporary linked list for accumulating p...Aneesh Kumar K.V2012-07-311-2/+2
| * mm: prepare for removal of obsolete /proc/sys/vm/nr_pdflush_threadsWanpeng Li2012-07-311-5/+0
* | Merge tag 'nfs-for-3.6-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-07-3132-390/+690
|\ \
| * | nfs: explicitly reject LOCK_MAND flock() requestsJeff Layton2012-07-311-0/+9
| * | nfs: increase number of permitted callback connections.NeilBrown2012-07-311-0/+4
| * | NFS: Convert v4 into a moduleBryan Schumaker2012-07-3021-108/+147
| * | NFS: Convert v3 into a moduleBryan Schumaker2012-07-3011-33/+25
| * | NFS: Convert v2 into a moduleBryan Schumaker2012-07-3012-24/+50
| * | NFS: Keep module parameters in the generic NFS clientBryan Schumaker2012-07-307-49/+48
| * | NFS: Split out remaining NFS v4 inode functionsBryan Schumaker2012-07-305-48/+41
| * | NFS: Pass super operations and xattr handlers in the nfs_subversionBryan Schumaker2012-07-306-25/+13
| * | NFS: Only initialize the ACL client in the v3 caseBryan Schumaker2012-07-3010-69/+96
| * | NFS: Create a try_mount rpc opBryan Schumaker2012-07-307-12/+12
| * | NFS: Remove the NFS v4 xdev mount functionBryan Schumaker2012-07-303-58/+10
| * | NFS: Add version registering frameworkBryan Schumaker2012-07-3011-61/+282
| * | NFS: Fix a number of bugs in the idmapperDavid Howells2012-07-301-6/+20
| * | nfs: skip commit in releasepage if we're freeing memory for fs-related reasonsJeff Layton2012-07-301-2/+5
| * | pnfsblock: bail out partial page IOPeng Tao2012-07-301-3/+36
* | | Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-07-3122-223/+330
|\ \ \
| * | | NFSd: make boot_time variable per network namespaceStanislav Kinsbursky2012-07-273-16/+25
| * | | NFSd: make grace end flag per network namespaceStanislav Kinsbursky2012-07-272-5/+4
| * | | Lockd: move grace period management from lockd() to per-net functionsStanislav Kinsbursky2012-07-271-6/+3
| * | | LockD: pass actual network namespace to grace period management functionsStanislav Kinsbursky2012-07-278-54/+62
| * | | LockD: manage grace list per network namespaceStanislav Kinsbursky2012-07-273-3/+13
| * | | SUNRPC: service request network namespace helper introducedStanislav Kinsbursky2012-07-274-7/+7
| * | | NFSd: make nfsd4_manager allocated per network namespace context.Stanislav Kinsbursky2012-07-272-13/+21
| * | | LockD: make lockd manager allocated per network namespaceStanislav Kinsbursky2012-07-272-8/+12
| * | | LockD: manage grace period per network namespaceStanislav Kinsbursky2012-07-272-6/+13
| * | | Lockd: add more debug to host shutdown functionsStanislav Kinsbursky2012-07-271-2/+2
| * | | Lockd: host complaining function introducedStanislav Kinsbursky2012-07-271-27/+30
| * | | LockD: manage used host count per networks namespaceStanislav Kinsbursky2012-07-272-0/+19
| * | | LockD: manage garbage collection timeout per networks namespaceStanislav Kinsbursky2012-07-272-3/+10
| * | | LockD: make garbage collector network namespace aware.Stanislav Kinsbursky2012-07-271-9/+13
| * | | LockD: mark host per network namespace on garbage collectStanislav Kinsbursky2012-07-272-7/+15
| * | | nfsd4: fix missing fault_inject.h includeJ. Bruce Fields2012-07-271-0/+1
| * | | locks: move lease-specific code out of locks_delete_lockJ. Bruce Fields2012-07-271-6/+5
| * | | locks: prevent side-effects of locks_release_private before file_lock is init...Filipe Brandenburger2012-07-271-11/+6
| * | | NFSd: set nfsd_serv to NULL after service destructionStanislav Kinsbursky2012-07-252-5/+7
| * | | NFSd: introduce nfsd_destroy() helperStanislav Kinsbursky2012-07-253-17/+14
| * | | nfsd: add get_uint for u32'sJ. Bruce Fields2012-07-251-3/+3
| * | | NFSd: fix locking in nfsd_forget_delegations()Stanislav Kinsbursky2012-07-251-6/+17
| * | | nfsd4: fix cr_principal comparison check in same_credsVivek Trivedi2012-07-251-2/+2
| * | | nfsd: share some function prototypesJ. Bruce Fields2012-07-101-0/+2
| * | | nfsd: allow owner_override only for regular filesJ. Bruce Fields2012-07-101-1/+9