← Back to branch summary

~ubuntu-branches/ubuntu/raring/linux-ti-omap4/raring-proposed

« back to all changes in this revision

Viewing changes to net/sunrpc/xprtsock.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-22.34
  • Date: 2013-01-11 15:02:20 UTC
  • mfrom: (72.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130111150220-kgmbtlwhyc4kwqhg
Tags: 3.5.0-217.25
https://launchpad.net/bugs/1097912
https://launchpad.net/bugs/1097343
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
https://launchpad.net/bugs/1096137
* Release Tracking Bug
  - LP: #1097912

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-22.34

[ Ubuntu: 3.5.0-22.34 ]

* Release Tracking Bug
  - LP: #1097343
* Revert "SAUCE: fsnotify: dont put marks on temporary list when clearing
  marks by group"
  - LP: #1096137
* Revert "SAUCE: fsnotify: introduce locked versions of
  fsnotify_add_mark() and fsnotify_remove_mark()"
  - LP: #1096137
* Revert "SAUCE: fsnotify: pass group to fsnotify_destroy_mark()"
  - LP: #1096137
* Revert "SAUCE: fsnotify: use a mutex instead of a spinlock to protect a
  groups mark list"
  - LP: #1096137
* Revert "SAUCE: fanotify: add an extra flag to mark_remove_from_mask
  that indicates wheather a mark should be destroyed"
  - LP: #1096137
* Revert "SAUCE: fsnotify: take groups mark_lock before mark lock"
  - LP: #1096137
* Revert "SAUCE: fsnotify: use reference counting for groups"
  - LP: #1096137
* Revert "SAUCE: fsnotify: introduce fsnotify_get_group()"
  - LP: #1096137
* fsnotify: introduce fsnotify_get_group()
  - LP: #1096137
* fsnotify: use reference counting for groups
  - LP: #1096137
* fsnotify: take groups mark_lock before mark lock
  - LP: #1096137
* fanotify: add an extra flag to mark_remove_from_mask that indicates
  wheather a mark should be destroyed
  - LP: #1096137
* fsnotify: use a mutex instead of a spinlock to protect a groups mark
  list
  - LP: #1096137
* fsnotify: pass group to fsnotify_destroy_mark()
  - LP: #1096137
* fsnotify: introduce locked versions of fsnotify_add_mark() and
  fsnotify_remove_mark()
  - LP: #1096137
* fsnotify: dont put marks on temporary list when clearing marks by group
  - LP: #1096137
* fsnotify: change locking order
  - LP: #1096137

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/sunrpc/xprtsock.c
2423
2423
static struct rpc_xprt_ops xs_local_ops = {
2424
2424
        .reserve_xprt           = xprt_reserve_xprt,
2425
2425
        .release_xprt           = xs_tcp_release_xprt,
 
2426
        .alloc_slot             = xprt_alloc_slot,
2426
2427
        .rpcbind                = xs_local_rpcbind,
2427
2428
        .set_port               = xs_local_set_port,
2428
2429
        .connect                = xs_connect,
2439
2440
        .set_buffer_size        = xs_udp_set_buffer_size,
2440
2441
        .reserve_xprt           = xprt_reserve_xprt_cong,
2441
2442
        .release_xprt           = xprt_release_xprt_cong,
 
2443
        .alloc_slot             = xprt_alloc_slot,
2442
2444
        .rpcbind                = rpcb_getport_async,
2443
2445
        .set_port               = xs_set_port,
2444
2446
        .connect                = xs_connect,
2456
2458
static struct rpc_xprt_ops xs_tcp_ops = {
2457
2459
        .reserve_xprt           = xprt_reserve_xprt,
2458
2460
        .release_xprt           = xs_tcp_release_xprt,
 
2461
        .alloc_slot             = xprt_lock_and_alloc_slot,
2459
2462
        .rpcbind                = rpcb_getport_async,
2460
2463
        .set_port               = xs_set_port,
2461
2464
        .connect                = xs_connect,
2475
2478
static struct rpc_xprt_ops bc_tcp_ops = {
2476
2479
        .reserve_xprt           = xprt_reserve_xprt,
2477
2480
        .release_xprt           = xprt_release_xprt,
 
2481
        .alloc_slot             = xprt_alloc_slot,
2478
2482
        .rpcbind                = xs_local_rpcbind,
2479
2483
        .buf_alloc              = bc_malloc,
2480
2484
        .buf_free               = bc_free,