summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-12-111-3/+3
|\
| * net: replace remaining users of arch_fast_hash with jhashDaniel Borkmann2014-12-101-3/+3
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2014-12-105-35/+31
|\ \ | |/ |/|
| * Merge branch 'iov_iter' into for-nextAl Viro2014-12-081-2/+5
| |\
| * | nfsd_vfs_write(): use file_inode()Al Viro2014-11-191-3/+1
| * | nfsd: get rid of ->f_dentryAl Viro2014-11-191-1/+1
| * | nfsd/nfsctl.c: new helperAl Viro2014-11-191-21/+16
| * | assorted conversions to %p[dD]Al Viro2014-11-191-1/+1
| * | vfs: make first argument of dir_context.actor typedMiklos Szeredi2014-10-313-9/+12
* | | nfsd: Fix slot wake up race in the nfsv4.1 callback codeTrond Myklebust2014-11-191-2/+6
* | | nfsd: correctly define v4.2 support attributesChristoph Hellwig2014-11-191-3/+6
| |/ |/|
* | nfsd4: fix crash on unknown operation numberJ. Bruce Fields2014-10-231-1/+2
* | nfsd4: fix response size estimation for OP_SEQUENCEJ. Bruce Fields2014-10-211-1/+3
|/
* Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2014-10-131-1/+0
|\
| * sched, cleanup, treewide: Remove set_current_state(TASK_RUNNING) after schedu...Kirill Tkhai2014-09-191-1/+0
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2014-10-121-1/+1
|\ \
| * \ Merge commit 'v3.16' into nextJames Morris2014-10-011-1/+3
| |\ \
| * | | ima: pass 'opened' flag to identify newly created filesDmitry Kasatkin2014-09-091-1/+1
* | | | Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linuxLinus Torvalds2014-10-112-46/+59
|\ \ \ \
| * | | | locks: give lm_break a return valueJeff Layton2014-10-071-8/+9
| * | | | locks: move freeing of leases outside of i_lockJeff Layton2014-10-071-3/+3
| * | | | locks: define a lm_setup handler for leasesJeff Layton2014-10-071-4/+2
| * | | | locks: plumb a "priv" pointer into the setlease routinesJeff Layton2014-10-071-2/+2
| * | | | nfsd: don't keep a pointer to the lease in nfs4_fileJeff Layton2014-10-072-10/+4
| * | | | locks: generic_delete_lease doesn't need a file_lock at allJeff Layton2014-10-071-1/+1
| * | | | nfsd: fix potential lease memory leak in nfs4_setleaseJeff Layton2014-10-071-2/+5
| * | | | NFSD: Get reference of lockowner when coping file_lockKinglong Mee2014-09-091-4/+21
| * | | | NFSD: New helper nfs4_get_stateowner() for atomic_inc sop referenceKinglong Mee2014-09-091-16/+16
* | | | | Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2014-10-0817-314/+662
|\ \ \ \ \
| * | | | | nfsd: eliminate "to_delegation" defineJeff Layton2014-10-013-7/+4
| * | | | | NFSD: Implement SEEKAnna Schumaker2014-09-293-2/+97
| * | | | | NFSD: Add generic v4.2 infrastructureAnna Schumaker2014-09-291-0/+28
| * | | | | nfsd: introduce nfsd4_callback_opsChristoph Hellwig2014-09-263-71/+83
| * | | | | nfsd: split nfsd4_callback initialization and useChristoph Hellwig2014-09-263-12/+13
| * | | | | nfsd: introduce a generic nfsd4_cbChristoph Hellwig2014-09-263-35/+22
| * | | | | nfsd: remove nfsd4_callback.cb_opChristoph Hellwig2014-09-262-9/+9
| * | | | | nfsd: do not clear rpc_resp in nfsd4_cb_done_sequenceBenny Halevy2014-09-261-3/+0
| * | | | | nfsd: fix nfsd4_cb_recall_done error handlingChristoph Hellwig2014-09-261-10/+7
| * | | | | nfsd4: clarify how grace period endsJ. Bruce Fields2014-09-171-0/+20
| * | | | | nfsd4: stop grace_time update at end of grace periodJ. Bruce Fields2014-09-171-6/+0
| * | | | | nfsd: skip subsequent UMH "create" operations after the first one for v4.0 cl...Jeff Layton2014-09-171-0/+16
| * | | | | nfsd: set and test NFSD4_CLIENT_STABLE bit to reduce nfsdcltrack upcallsJeff Layton2014-09-171-4/+18
| * | | | | nfsd: serialize nfsdcltrack upcalls for a particular clientJeff Layton2014-09-172-0/+30
| * | | | | nfsd: pass extra info in env vars to upcalls to allow for early grace period endJeff Layton2014-09-172-15/+85
| * | | | | nfsd: add a v4_end_grace file to /proc/fs/nfsdJeff Layton2014-09-173-1/+49
| * | | | | nfsd: reject reclaim request when client has already sent RECLAIM_COMPLETEJeff Layton2014-09-171-0/+3
| * | | | | nfsd: remove redundant boot_time parm from grace_done client tracking opJeff Layton2014-09-173-11/+10
| * | | | | lockd: move lockd's grace period handling into its own moduleJeff Layton2014-09-171-0/+1
| * | | | | nfsd: update mtime on truncateChristoph Hellwig2014-09-111-0/+10
| * | | | | NFSD: Put export if prepare_creds() failKinglong Mee2014-09-031-2/+4