summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfs-for-3.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2013-03-022-1/+20
|\
| * SUNRPC: One line comment fixTrond Myklebust2013-03-021-1/+1
| * SUNRPC: add call to get configured timeoutWeston Andros Adamson2013-02-281-0/+15
| * SUNRPC: Don't start the retransmission timer when out of socket spaceTrond Myklebust2013-02-221-1/+5
* | Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2013-02-2812-101/+162
|\ \
| * | SUNRPC: make AF_LOCAL connect synchronousJ. Bruce Fields2013-02-281-8/+27
| * | svcrpc: fix rpc server shutdown racesJ. Bruce Fields2013-02-172-34/+32
| * | svcrpc: make svc_age_temp_xprts enqueue under sv_lockJ. Bruce Fields2013-02-171-13/+2
| * | SUNRPC: move cache_detail->cache_request callback call to cache_read()Stanislav Kinsbursky2013-02-151-12/+20
| * | SUNRPC: remove "cache_request" argument in sunrpc_cache_pipe_upcall() functionStanislav Kinsbursky2013-02-151-7/+3
| * | SUNRPC: rework cache upcall logicStanislav Kinsbursky2013-02-153-23/+7
| * | SUNRPC: introduce cache_detail->cache_request callbackStanislav Kinsbursky2013-02-152-3/+6
| * | sunrpc: trim off trailing checksum before returning decrypted or integrity au...Jeff Layton2013-02-083-2/+51
| * | sunrpc: move address copy/cmp/convert routines and prototypes from clnt.h to ...Jeff Layton2013-02-056-2/+7
| * | sunrpc: Fix lockd sleeping until timeoutAndriy Skulysh2013-01-231-1/+8
| * | svcrpc: silence "unused variable" warning in !RPC_DEBUG caseJ. Bruce Fields2013-01-231-0/+4
| * | nfsd: Remove write permission from file contentYanchuan Nian2013-01-231-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2013-02-2810-574/+749
|\ \ \
| * | | libceph: add support for HASHPSPOOL pool flagSage Weil2013-02-261-13/+26
| * | | libceph: update osd request/reply encodingSage Weil2013-02-262-77/+174
| * | | libceph: calculate placement based on the internal data typesSage Weil2013-02-262-17/+12
| * | | ceph: update support for PGID64, PGPOOL3, OSDENC protocol featuresSage Weil2013-02-263-83/+91
| * | | libceph: decode into cpu-native ceph_pg typeSage Weil2013-02-263-42/+50
| * | | libceph: rename ceph_pg -> ceph_pg_v1Sage Weil2013-02-262-10/+10
| * | | libceph: use a do..while loop in con_work()Alex Elder2013-02-251-41/+42
| * | | libceph: use a flag to indicate a fault has occurredAlex Elder2013-02-251-12/+12
| * | | libceph: separate non-locked fault handlingAlex Elder2013-02-251-19/+23
| * | | libceph: encapsulate connection backoffAlex Elder2013-02-251-13/+24
| * | | libceph: eliminate sparse warningsAlex Elder2013-02-253-5/+6
| * | | libceph: define connection flag helpersAlex Elder2013-02-251-29/+78
| * | | Merge branch 'testing' of github.com:ceph/ceph-client into into linux-3.8-cephAlex Elder2013-02-197-286/+274
| |\ \ \
| | * | | libceph: drop return value from page vector copy routinesAlex Elder2013-02-191-8/+6
| | * | | libceph: use void pointers in page vector functionsAlex Elder2013-02-191-5/+5
| | * | | libceph: allow STAT osd operationsAlex Elder2013-02-191-1/+2
| | * | | libceph: simplify data length calculationAlex Elder2013-02-191-8/+4
| | * | | libceph: remove dead code in osd_req_encode_op()Alex Elder2013-02-181-26/+5
| | * | | libceph: report defined but unsupported osd opsAlex Elder2013-02-181-0/+54
| | * | | libceph: update ceph_osd_op_name()Alex Elder2013-02-181-0/+24
| | * | | libceph: add ceph_osd_state_name()Alex Elder2013-02-181-0/+15
| | * | | libceph: kill ceph_osdc_wait_event()Alex Elder2013-02-181-18/+0
| | * | | libceph: kill ceph_osdc_create_event() "one_shot" parameterAlex Elder2013-02-181-6/+5
| | * | | libceph: kill ceph_calc_raw_layout()Alex Elder2013-02-181-45/+32
| | * | | libdeph: don't export ceph_osdc_init() or ceph_osdc_stop()Alex Elder2013-02-181-2/+0
| | * | | libceph: lock outside send_queued()Alex Elder2013-02-181-10/+9
| | * | | ceph: kill ceph_osdc_new_request() "num_reply" parameterAlex Elder2013-02-181-3/+3
| | * | | ceph: kill ceph_osdc_writepages() "flags" parameterAlex Elder2013-02-181-4/+2
| | * | | ceph: kill ceph_osdc_writepages() "dosync" parameterAlex Elder2013-02-181-2/+2
| | * | | ceph: kill ceph_osdc_writepages() "nofail" parameterAlex Elder2013-02-181-3/+3
| | * | | libceph: don't require r_num_pages for bio requestsAlex Elder2013-02-131-3/+4
| | * | | rbd: don't take extra bio reference for osd clientAlex Elder2013-02-132-5/+1