aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
Commit message (Expand)AuthorAge
* Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-01-14
|\
| * nfsd4: fix callback restartingJ. Bruce Fields2011-01-14
| * nfsd: break lease on unlink, link, and renameJ. Bruce Fields2011-01-13
| * nfsd4: break lease on nfsd setattrJ. Bruce Fields2011-01-13
| * nfsd: don't support msnfs export optionJ. Bruce Fields2011-01-13
| * nfsd4: initialize cb_per_clientJ. Bruce Fields2011-01-13
| * nfsd4: allow restarting callbacksJ. Bruce Fields2011-01-11
| * nfsd4: simplify nfsd4_cb_prepareJ. Bruce Fields2011-01-11
| * nfsd4: give out delegations more quickly in 4.1 caseJ. Bruce Fields2011-01-11
| * nfsd4: add helper function to run callbacksJ. Bruce Fields2011-01-11
| * nfsd4: make sure sequence flags are set after destroy_sessionJ. Bruce Fields2011-01-11
| * nfsd4: re-probe callback on connection lossJ. Bruce Fields2011-01-11
| * nfsd4: set sequence flag when backchannel is downJ. Bruce Fields2011-01-11
| * nfsd4: keep finer-grained callback statusJ. Bruce Fields2011-01-11
| * nfsd4: allow backchannel recoveryJ. Bruce Fields2011-01-11
| * nfsd4: support BIND_CONN_TO_SESSIONJ. Bruce Fields2011-01-11
| * nfsd4: modify session list under cl_lockJ. Bruce Fields2011-01-11
| * nfs4: set source address when callback is generatedTakuma Umeya2011-01-04
| * nfsd4: return nfs errno from name_to_id functionsJ. Bruce Fields2011-01-04
| * nfsd4: remove outdated pathname-commentsJ. Bruce Fields2011-01-04
| * nfsd4: move idmap and acl header files into fs/nfsdJ. Bruce Fields2011-01-04
| * nfsd4: name->id mapping should fail with BADOWNER not BADNAMEJ. Bruce Fields2011-01-04
| * locks: eliminate fl_mylease callbackJ. Bruce Fields2011-01-04
| * nfsd4: use a single struct file for delegationsJ. Bruce Fields2011-01-04
| * nfsd4: eliminate lease delete callbackJ. Bruce Fields2011-01-04
| * nfsd: remove some unnecessary dropit handlingJ. Bruce Fields2011-01-04
| * nfsd: stop translating EAGAIN to nfserr_dropitJ. Bruce Fields2011-01-04
| * svcrpc: simpler request droppingJ. Bruce Fields2011-01-04
| * nfsd: don't drop requests on -ENOMEMJ. Bruce Fields2011-01-04
| * nfsd: declare several functions of nfs4callback as staticKirill A. Shutemov2011-01-04
| * nfsd4: fix oops on secinfo_no_name result encodingMi Jinlong2010-12-29
| * nfsd4: implement secinfo_no_nameJ. Bruce Fields2010-12-17
| * nfsd4: move guts of nfsd4_lookupp into helperJ. Bruce Fields2010-12-17
| * nfsd4: 4.1 SECINFO should consume filehandleJ. Bruce Fields2010-12-17
| * nfs: add missed CONFIG_NFSD_DEPRECATEDbookjovi@gmail.com2010-12-17
| * nfsd: fix offset printk's in nfsd3 read/writeJ. Bruce Fields2010-12-17
| * nfsd4: fix mixed 4.0/4.1 handling, 4.1 rebootJ. Bruce Fields2010-12-17
| * nfsd4: replace unintuitive match_clientid_establishmentJ. Bruce Fields2010-12-17
| * Merge commit 'v2.6.37-rc6' into for-2.6.38J. Bruce Fields2010-12-17
| |\
| * | NFS4.1: Fix bug server don't reply the right fore_channel to client at create...Mi Jinlong2010-11-19
| * | NFS4.1: server gets drc mem fail should reply error at create_sessionMi Jinlong2010-11-19
| * | nfsd4: return serverfault on request for ssvJ. Bruce Fields2010-11-19
| * | NFSv4.1: Make sure nfsd can decode SP4_SSV correctly at exchange_idMi Jinlong2010-11-19
| * | nfsd: fix NULL dereference in setattr()Dan Carpenter2010-11-19
* | | Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-01-13
|\ \ \
| * | | Fix compile warnings due to missing removal of a 'ret' variableJens Axboe2010-12-20
| * | | fs/splice: Pull buf->ops->confirm() from splice_from_pipe actorsMichał Mirosław2010-12-17
| |/ /
* | | Merge branch 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs...Linus Torvalds2011-01-11
|\ \ \
| * | | SUNRPC: New xdr_streams XDR decoder APIChuck Lever2010-12-16
| * | | SUNRPC: New xdr_streams XDR encoder APIChuck Lever2010-12-16