summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-15 21:06:38 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-15 21:06:38 +0100
commitf60c153d503e798b354333772e7c00f1e8733e71 (patch)
treef34aef151cd9566412dede029cb85762c8be0866 /drivers
parentMerge branches 'core-fixes-for-linus' and 'timers-fixes-for-linus' of git://g... (diff)
parentnfsd: break lease on unlink due to rename (diff)
downloadlinux-f60c153d503e798b354333772e7c00f1e8733e71.tar.xz
linux-f60c153d503e798b354333772e7c00f1e8733e71.zip
Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux: nfsd: break lease on unlink due to rename nfsd4: acquire only one lease per file nfsd4: modify fi_delegations under recall_lock nfsd4: remove unused deleg dprintk's. nfsd4: split lease setting into separate function nfsd4: fix leak on allocation error nfsd4: add helper function for lease setup nfsd4: split up nfsd_break_deleg_cb NFSD: memory corruption due to writing beyond the stat array NFSD: use nfserr for status after decode_cb_op_status nfsd: don't leak dentry count on mnt_want_write failure
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions