diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-03-06 00:31:00 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-03-06 00:31:00 +0000 |
| commit | 8a236264f7d6db3f52881d37a86c5a5f704072b0 (patch) | |
| tree | 2caf0cb67d6986b8e3544405b89135f24c05c137 /fs/cifs/transport.c | |
| parent | c7af1857ef74873bf5a9c8fcab0cfd79883492ac (diff) | |
| download | linux-8a236264f7d6db3f52881d37a86c5a5f704072b0.tar.gz linux-8a236264f7d6db3f52881d37a86c5a5f704072b0.tar.bz2 linux-8a236264f7d6db3f52881d37a86c5a5f704072b0.zip | |
[CIFS] cifs_prepare_write was incorrectly rereading page in some cases
Noticed by Shaggy.
Signed-off-by: Shaggy <shaggy@us.ibm.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/transport.c')
| -rw-r--r-- | fs/cifs/transport.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index f80007eaebf4..5f468459a1e2 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -499,7 +499,7 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, due to last connection to this server being unmounted */ if (signal_pending(current)) { /* if signal pending do not hold up user for full smb timeout - but we still give response a change to complete */ + but we still give response a chance to complete */ timeout = 2 * HZ; } @@ -587,7 +587,6 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, } out: - DeleteMidQEntry(midQ); atomic_dec(&ses->server->inFlight); wake_up(&ses->server->request_q); @@ -681,7 +680,7 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, due to last connection to this server being unmounted */ if (signal_pending(current)) { /* if signal pending do not hold up user for full smb timeout - but we still give response a change to complete */ + but we still give response a chance to complete */ timeout = 2 * HZ; } @@ -765,7 +764,6 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses, } out: - DeleteMidQEntry(midQ); atomic_dec(&ses->server->inFlight); wake_up(&ses->server->request_q); |