Merge branch 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (89 commits) NFS fix the setting of exchange id flag NFS: Don't use vm_map_ram() in readdir NFSv4: Ensure continued open and lockowner name uniqueness NFS: Move cl_delegations to the nfs_server struct NFS: Introduce nfs_detach_delegations() NFS: Move cl_state_owners and related fields to the nfs_server struct NFS: Allow walking nfs_client.cl_superblocks list outside client.c pnfs: layout roc code pnfs: update nfs4_callback_recallany to handle layouts pnfs: add CB_LAYOUTRECALL handling pnfs: CB_LAYOUTRECALL xdr code pnfs: change lo refcounting to atomic_t pnfs: check that partial LAYOUTGET return is ignored pnfs: add layout to client list before sending rpc pnfs: serialize LAYOUTGET(openstateid) pnfs: layoutget rpc code cleanup pnfs: change how lsegs are removed from layout list pnfs: change layout state seqlock to a spinlock pnfs: add prefix to struct pnfs_layout_hdr fields pnfs: add prefix to struct pnfs_layout_segment fields ...
Showing
- fs/lockd/Makefile 3 additions, 3 deletionsfs/lockd/Makefile
- fs/lockd/clnt4xdr.c 605 additions, 0 deletionsfs/lockd/clnt4xdr.c
- fs/lockd/clntlock.c 2 additions, 2 deletionsfs/lockd/clntlock.c
- fs/lockd/clntproc.c 9 additions, 9 deletionsfs/lockd/clntproc.c
- fs/lockd/clntxdr.c 627 additions, 0 deletionsfs/lockd/clntxdr.c
- fs/lockd/host.c 245 additions, 164 deletionsfs/lockd/host.c
- fs/lockd/mon.c 42 additions, 68 deletionsfs/lockd/mon.c
- fs/lockd/svc4proc.c 10 additions, 10 deletionsfs/lockd/svc4proc.c
- fs/lockd/svclock.c 32 additions, 2 deletionsfs/lockd/svclock.c
- fs/lockd/svcproc.c 18 additions, 10 deletionsfs/lockd/svcproc.c
- fs/lockd/xdr.c 0 additions, 287 deletionsfs/lockd/xdr.c
- fs/lockd/xdr4.c 0 additions, 255 deletionsfs/lockd/xdr4.c
- fs/nfs/callback.c 70 additions, 13 deletionsfs/nfs/callback.c
- fs/nfs/callback.h 51 additions, 8 deletionsfs/nfs/callback.h
- fs/nfs/callback_proc.c 221 additions, 105 deletionsfs/nfs/callback_proc.c
- fs/nfs/callback_xdr.c 127 additions, 16 deletionsfs/nfs/callback_xdr.c
- fs/nfs/client.c 210 additions, 92 deletionsfs/nfs/client.c
- fs/nfs/delegation.c 259 additions, 103 deletionsfs/nfs/delegation.c
- fs/nfs/delegation.h 1 addition, 0 deletionsfs/nfs/delegation.h
- fs/nfs/dir.c 36 additions, 36 deletionsfs/nfs/dir.c
Loading
Please register or sign in to comment