diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 16:43:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 16:43:21 -0400 |
commit | 06f4e926d256d902dd9a53dcb400fd74974ce087 (patch) | |
tree | 0b438b67f5f0eff6fd617bc497a9dace6164a488 /net/9p/client.c | |
parent | 8e7bfcbab3825d1b404d615cb1b54f44ff81f981 (diff) | |
parent | d93515611bbc70c2fe4db232e5feb448ed8e4cc9 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
macvlan: fix panic if lowerdev in a bond
tg3: Add braces around 5906 workaround.
tg3: Fix NETIF_F_LOOPBACK error
macvlan: remove one synchronize_rcu() call
networking: NET_CLS_ROUTE4 depends on INET
irda: Fix error propagation in ircomm_lmp_connect_response()
irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
be2net: Kill set but unused variable 'req' in lancer_fw_download()
irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
isdn: capi: Use pr_debug() instead of ifdefs.
tg3: Update version to 3.119
tg3: Apply rx_discards fix to 5719/5720
...
Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.
Diffstat (limited to 'net/9p/client.c')
-rw-r--r-- | net/9p/client.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index a9aa2dd6648..ceab943dfc4 100644 --- a/net/9p/client.c +++ b/net/9p/client.c | |||
@@ -1281,7 +1281,7 @@ int | |||
1281 | p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset, | 1281 | p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset, |
1282 | u32 count) | 1282 | u32 count) |
1283 | { | 1283 | { |
1284 | int err, rsize, total; | 1284 | int err, rsize; |
1285 | struct p9_client *clnt; | 1285 | struct p9_client *clnt; |
1286 | struct p9_req_t *req; | 1286 | struct p9_req_t *req; |
1287 | char *dataptr; | 1287 | char *dataptr; |
@@ -1290,7 +1290,6 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset, | |||
1290 | (long long unsigned) offset, count); | 1290 | (long long unsigned) offset, count); |
1291 | err = 0; | 1291 | err = 0; |
1292 | clnt = fid->clnt; | 1292 | clnt = fid->clnt; |
1293 | total = 0; | ||
1294 | 1293 | ||
1295 | rsize = fid->iounit; | 1294 | rsize = fid->iounit; |
1296 | if (!rsize || rsize > clnt->msize-P9_IOHDRSZ) | 1295 | if (!rsize || rsize > clnt->msize-P9_IOHDRSZ) |
@@ -1346,7 +1345,7 @@ int | |||
1346 | p9_client_write(struct p9_fid *fid, char *data, const char __user *udata, | 1345 | p9_client_write(struct p9_fid *fid, char *data, const char __user *udata, |
1347 | u64 offset, u32 count) | 1346 | u64 offset, u32 count) |
1348 | { | 1347 | { |
1349 | int err, rsize, total; | 1348 | int err, rsize; |
1350 | struct p9_client *clnt; | 1349 | struct p9_client *clnt; |
1351 | struct p9_req_t *req; | 1350 | struct p9_req_t *req; |
1352 | 1351 | ||
@@ -1354,7 +1353,6 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata, | |||
1354 | fid->fid, (long long unsigned) offset, count); | 1353 | fid->fid, (long long unsigned) offset, count); |
1355 | err = 0; | 1354 | err = 0; |
1356 | clnt = fid->clnt; | 1355 | clnt = fid->clnt; |
1357 | total = 0; | ||
1358 | 1356 | ||
1359 | rsize = fid->iounit; | 1357 | rsize = fid->iounit; |
1360 | if (!rsize || rsize > clnt->msize-P9_IOHDRSZ) | 1358 | if (!rsize || rsize > clnt->msize-P9_IOHDRSZ) |
@@ -1745,7 +1743,7 @@ EXPORT_SYMBOL_GPL(p9_client_xattrcreate); | |||
1745 | 1743 | ||
1746 | int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset) | 1744 | int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset) |
1747 | { | 1745 | { |
1748 | int err, rsize, total; | 1746 | int err, rsize; |
1749 | struct p9_client *clnt; | 1747 | struct p9_client *clnt; |
1750 | struct p9_req_t *req; | 1748 | struct p9_req_t *req; |
1751 | char *dataptr; | 1749 | char *dataptr; |
@@ -1755,7 +1753,6 @@ int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset) | |||
1755 | 1753 | ||
1756 | err = 0; | 1754 | err = 0; |
1757 | clnt = fid->clnt; | 1755 | clnt = fid->clnt; |
1758 | total = 0; | ||
1759 | 1756 | ||
1760 | rsize = fid->iounit; | 1757 | rsize = fid->iounit; |
1761 | if (!rsize || rsize > clnt->msize-P9_READDIRHDRSZ) | 1758 | if (!rsize || rsize > clnt->msize-P9_READDIRHDRSZ) |