Merge branch 'devel'
Showing
- fs/Kconfig 33 additions, 37 deletionsfs/Kconfig
- fs/lockd/clntproc.c 117 additions, 67 deletionsfs/lockd/clntproc.c
- fs/lockd/host.c 11 additions, 9 deletionsfs/lockd/host.c
- fs/lockd/mon.c 87 additions, 26 deletionsfs/lockd/mon.c
- fs/lockd/svc.c 12 additions, 0 deletionsfs/lockd/svc.c
- fs/nfs/Makefile 1 addition, 2 deletionsfs/nfs/Makefile
- fs/nfs/client.c 23 additions, 0 deletionsfs/nfs/client.c
- fs/nfs/dir.c 1 addition, 1 deletionfs/nfs/dir.c
- fs/nfs/direct.c 54 additions, 34 deletionsfs/nfs/direct.c
- fs/nfs/file.c 2 additions, 16 deletionsfs/nfs/file.c
- fs/nfs/inode.c 43 additions, 2 deletionsfs/nfs/inode.c
- fs/nfs/internal.h 5 additions, 8 deletionsfs/nfs/internal.h
- fs/nfs/namespace.c 1 addition, 1 deletionfs/nfs/namespace.c
- fs/nfs/nfs2xdr.c 66 additions, 47 deletionsfs/nfs/nfs2xdr.c
- fs/nfs/nfs3xdr.c 45 additions, 26 deletionsfs/nfs/nfs3xdr.c
- fs/nfs/nfs4proc.c 22 additions, 17 deletionsfs/nfs/nfs4proc.c
- fs/nfs/nfs4state.c 43 additions, 6 deletionsfs/nfs/nfs4state.c
- fs/nfs/nfs4xdr.c 90 additions, 57 deletionsfs/nfs/nfs4xdr.c
- fs/nfs/read.c 55 additions, 39 deletionsfs/nfs/read.c
- fs/nfs/super.c 100 additions, 47 deletionsfs/nfs/super.c
Please register or sign in to comment