linux.git/net/rds, branch v2.6.31

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-05-19T04:08:20+00:00

Conflicts:
	drivers/scsi/fcoe/fcoe.c

FRV: Fix the section attribute on UP DECLARE_PER_CPU()

2009-04-22T02:39:59+00:00

In non-SMP mode, the variable section attribute specified by DECLARE_PER_CPU()
does not agree with that specified by DEFINE_PER_CPU().  This means that
architectures that have a small data section references relative to a base
register may throw up linkage errors due to too great a displacement between
where the base register points and the per-CPU variable.

On FRV, the .h declaration says that the variable is in the .sdata section, but
the .c definition says it's actually in the .data section.  The linker throws
up the following errors:

kernel/built-in.o: In function `release_task':
kernel/exit.c:78: relocation truncated to fit: R_FRV_GPREL12 against symbol `per_cpu__process_counts' defined in .data section in kernel/built-in.o
kernel/exit.c:78: relocation truncated to fit: R_FRV_GPREL12 against symbol `per_cpu__process_counts' defined in .data section in kernel/built-in.o

To fix this, DECLARE_PER_CPU() should simply apply the same section attribute
as does DEFINE_PER_CPU().  However, this is made slightly more complex by
virtue of the fact that there are several variants on DEFINE, so these need to
be matched by variants on DECLARE.

Signed-off-by: David Howells 
Signed-off-by: Linus Torvalds

ERR_PTR() dereference in net/rds/ib.c

2009-04-10T00:21:22+00:00

rdma_create_id() doesn't return NULL, only ERR_PTR().

Found by smatch (http://repo.or.cz/w/smatch.git).  Compile tested.

regards,
dan carpenter

Signed-off-by: Dan Carpenter 
Signed-off-by: Andy Grover 
Signed-off-by: David S. Miller

ERR_PTR() dereference in net/rds/iw.c

2009-04-10T00:21:22+00:00

rdma_create_id() returns ERR_PTR() not null.

Found by smatch (http://repo.or.cz/w/smatch.git).  Compile tested.

regards,
dan carpenter

Signed-off-by: Dan Carpenter 
Signed-off-by: Andy Grover 
Signed-off-by: David S. Miller

rds: use kmem_cache_zalloc instead of kmem_cache_alloc/memset

2009-04-10T00:21:21+00:00

Use kmem_cache_zalloc instead of kmem_cache_alloc/memset.

Signed-off-by: Wei Yongjun 
Signed-off-by: Andy Grover 
Signed-off-by: David S. Miller

RDS: remove unused #include

2009-04-10T00:21:20+00:00

Remove unused #include  in net/rds/af_rds.c.

Signed-off-by: Huang Weiyi 
Signed-off-by: Andy Grover 
Signed-off-by: David S. Miller

RDS: use get_user_pages_fast()

2009-04-10T00:21:20+00:00

Use the new function that is simpler and faster.

Signed-off-by: Andy Grover 
Signed-off-by: David S. Miller

RDS: Establish connection before parsing CMSGs

2009-04-10T00:21:19+00:00

The first message to a remote node should prompt a new connection.
Even an RDMA op via CMSG. Therefore move CMSG parsing to after
connection establishment.

Signed-off-by: Andy Grover 
Signed-off-by: David S. Miller

RDS: Fix ordering in a conditional

2009-04-10T00:21:18+00:00

Putting the constant first is a supposed "best practice" that actually makes
the code harder to read.

Thanks to Roland Dreier for finding a bug in this "simple, obviously correct"
patch.

Signed-off-by: Andy Grover 
Signed-off-by: David S. Miller

RDS/IW+IB: Allow max credit advertise window.

2009-04-10T00:21:17+00:00

Fix hack that restricts the credit advertisement to 127.

Signed-off-by: Steve Wise 
Signed-off-by: Andy Grover 
Signed-off-by: David S. Miller