Staging
v0.8.1
v0.8.1
https://github.com/torvalds/linux
Revision 241c39b9ac4bf847013aa06cce6d4d61426a2006 authored by Trond Myklebust on 20 April 2007, 20:12:55 UTC, committed by Linus Torvalds on 21 April 2007, 05:56:30 UTC
Fix a regression due to the patch "NFS: disconnect before retrying NFSv4 requests over TCP" The assumption made in xprt_transmit() that the condition "req->rq_bytes_sent == 0 and request is on the receive list" should imply that we're dealing with a retransmission is false. Firstly, it may simply happen that the socket send queue was full at the time the request was initially sent through xprt_transmit(). Secondly, doing this for each request that was retransmitted implies that we disconnect and reconnect for _every_ request that happened to be retransmitted irrespective of whether or not a disconnection has already occurred. Fix is to move this logic into the call_status request timeout handler. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 2b82f19
Tip revision: 241c39b9ac4bf847013aa06cce6d4d61426a2006 authored by Trond Myklebust on 20 April 2007, 20:12:55 UTC
RPC: Fix the TCP resend semantics for NFSv4
RPC: Fix the TCP resend semantics for NFSv4
Tip revision: 241c39b
bt455.h
/*
* linux/drivers/video/bt455.h
*
* Copyright 2003 Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
* archive for more details.
*/
#include <linux/types.h>
#include <asm/system.h>
/*
* Bt455 byte-wide registers, 32-bit aligned.
*/
struct bt455_regs {
volatile u8 addr_cmap;
u8 pad0[3];
volatile u8 addr_cmap_data;
u8 pad1[3];
volatile u8 addr_clr;
u8 pad2[3];
volatile u8 addr_ovly;
u8 pad3[3];
};
static inline void bt455_select_reg(struct bt455_regs *regs, int ir)
{
mb();
regs->addr_cmap = ir & 0x0f;
}
/*
* Read/write to a Bt455 color map register.
*/
static inline void bt455_read_cmap_entry(struct bt455_regs *regs, int cr,
u8* red, u8* green, u8* blue)
{
bt455_select_reg(regs, cr);
mb();
*red = regs->addr_cmap_data & 0x0f;
rmb();
*green = regs->addr_cmap_data & 0x0f;
rmb();
*blue = regs->addr_cmap_data & 0x0f;
}
static inline void bt455_write_cmap_entry(struct bt455_regs *regs, int cr,
u8 red, u8 green, u8 blue)
{
bt455_select_reg(regs, cr);
wmb();
regs->addr_cmap_data = red & 0x0f;
wmb();
regs->addr_cmap_data = green & 0x0f;
wmb();
regs->addr_cmap_data = blue & 0x0f;
}
static inline void bt455_write_ovly_entry(struct bt455_regs *regs, int cr,
u8 red, u8 green, u8 blue)
{
bt455_select_reg(regs, cr);
wmb();
regs->addr_ovly = red & 0x0f;
wmb();
regs->addr_ovly = green & 0x0f;
wmb();
regs->addr_ovly = blue & 0x0f;
}
static inline void bt455_set_cursor(struct bt455_regs *regs)
{
mb();
regs->addr_ovly = 0x0f;
wmb();
regs->addr_ovly = 0x0f;
wmb();
regs->addr_ovly = 0x0f;
}
static inline void bt455_erase_cursor(struct bt455_regs *regs)
{
/* bt455_write_cmap_entry(regs, 8, 0x00, 0x00, 0x00); */
/* bt455_write_cmap_entry(regs, 9, 0x00, 0x00, 0x00); */
bt455_write_ovly_entry(regs, 8, 0x03, 0x03, 0x03);
bt455_write_ovly_entry(regs, 9, 0x07, 0x07, 0x07);
wmb();
regs->addr_ovly = 0x09;
wmb();
regs->addr_ovly = 0x09;
wmb();
regs->addr_ovly = 0x09;
}
Computing file changes ...