diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 17:32:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 17:32:22 -0800 |
| commit | 9f6632d6290785caf9e9f874c0a0cfaf2c178e59 (patch) | |
| tree | 2757e79374b98211170782c1ff8d15b8532492b7 /fs/cifs/transport.c | |
| parent | 8328258e745b80290534c9ab5bede6cd8340ea75 (diff) | |
| parent | 8a236264f7d6db3f52881d37a86c5a5f704072b0 (diff) | |
| download | op-kernel-dev-9f6632d6290785caf9e9f874c0a0cfaf2c178e59.zip op-kernel-dev-9f6632d6290785caf9e9f874c0a0cfaf2c178e59.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] cifs_prepare_write was incorrectly rereading page in some cases
[CIFS] Fix set file size to zero when doing chmod to Samba 3.0.26pre
[CIFS] Remove some unused functions/declarations
[CIFS] New file for previous commit
[CIFS] cifs export operations
[CIFS] small piece missing from previous patch
[CIFS] Fix locking problem around some cifs uses of i_size write
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 f80007e..5f46845 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); |
