From 1c3f8b613fc7007691735498f95e588e9103f0f4 Mon Sep 17 00:00:00 2001 From: "Justin P. Mattock" Date: Mon, 9 Apr 2012 07:48:57 -0700 Subject: [PATCH] --- yaml --- r: 304299 b: refs/heads/master c: d740e889d2a49b48a4527b5192dea9278e691d6f h: refs/heads/master i: 304297: 497cd885ca03388cc082b51236817cf5c60a3b59 304295: 730f5b764c8719f91f6eb90557f5547831f3f2fe v: v3 --- [refs] | 2 +- trunk/drivers/staging/ramster/cluster/tcp.c | 4 ++-- trunk/drivers/staging/ramster/xvmalloc.c | 2 +- trunk/drivers/staging/ramster/zcache-main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ec601c1fde81..76cccce7c2fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6354eb81fe8cc32899959d2dac23aa1c9a12c9fa +refs/heads/master: d740e889d2a49b48a4527b5192dea9278e691d6f diff --git a/trunk/drivers/staging/ramster/cluster/tcp.c b/trunk/drivers/staging/ramster/cluster/tcp.c index 3af1b2c51b78..3490192f8ca2 100644 --- a/trunk/drivers/staging/ramster/cluster/tcp.c +++ b/trunk/drivers/staging/ramster/cluster/tcp.c @@ -111,7 +111,7 @@ static struct socket *r2net_listen_sock; * r2net_wq. teardown detaches the callbacks before destroying the workqueue. * quorum work is queued as sock containers are shutdown.. stop_listening * tears down all the node's sock containers, preventing future shutdowns - * and queued quroum work, before canceling delayed quorum work and + * and queued quorum work, before canceling delayed quorum work and * destroying the work queue. */ static struct workqueue_struct *r2net_wq; @@ -660,7 +660,7 @@ static void r2net_state_change(struct sock *sk) /* * we register callbacks so we can queue work on events before calling - * the original callbacks. our callbacks our careful to test user_data + * the original callbacks. our callbacks are careful to test user_data * to discover when they've reaced with r2net_unregister_callbacks(). */ static void r2net_register_callbacks(struct sock *sk, diff --git a/trunk/drivers/staging/ramster/xvmalloc.c b/trunk/drivers/staging/ramster/xvmalloc.c index 93ba8e9407aa..44ceb0b823a9 100644 --- a/trunk/drivers/staging/ramster/xvmalloc.c +++ b/trunk/drivers/staging/ramster/xvmalloc.c @@ -132,7 +132,7 @@ static u32 find_block(struct xv_pool *pool, u32 size, if (!pool->flbitmap) return 0; - /* Get freelist index correspoding to this size */ + /* Get freelist index corresponding to this size */ slindex = get_index(size); slbitmap = pool->slbitmap[slindex / BITS_PER_LONG]; slbitstart = slindex % BITS_PER_LONG; diff --git a/trunk/drivers/staging/ramster/zcache-main.c b/trunk/drivers/staging/ramster/zcache-main.c index 68b2e053a0e6..c071111f06f3 100644 --- a/trunk/drivers/staging/ramster/zcache-main.c +++ b/trunk/drivers/staging/ramster/zcache-main.c @@ -2095,7 +2095,7 @@ int zcache_localify(int pool_id, struct tmem_oid *oidp, /* * Called on a remote persistent tmem_get to attempt to preallocate * local storage for the data contained in the remote persistent page. - * If succesfully preallocated, returns the pampd, marked as remote and + * If successfully preallocated, returns the pampd, marked as remote and * in_transit. Else returns NULL. Note that the appropriate tmem data * structure must be locked. */