diff options
author | Jeff Layton <jlayton@redhat.com> | 2009-04-03 13:44:00 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2009-04-17 01:26:49 +0000 |
commit | fbec9ab952d4810960e620035c8e95f0fbbae4be (patch) | |
tree | e4d8ef8e0fbe2703d98390d96151cbf40d32f434 /fs/cifs/readdir.c | |
parent | d036f50fc202e1a851a25dc5edc215ebd0086201 (diff) | |
download | linux-3.10-fbec9ab952d4810960e620035c8e95f0fbbae4be.tar.gz linux-3.10-fbec9ab952d4810960e620035c8e95f0fbbae4be.tar.bz2 linux-3.10-fbec9ab952d4810960e620035c8e95f0fbbae4be.zip |
cifs: vary timeout on writes past EOF based on offset (try #5)
This is the fourth version of this patch:
The first three generated a compiler warning asking for explicit curly
braces.
The first two didn't handle update the size correctly when writes that
didn't start at the eof were done.
The first patch also didn't update the size correctly when it explicitly
set via truncate().
This patch adds code to track the client's current understanding of the
size of the file on the server separate from the i_size, and then to use
this info to semi-intelligently set the timeout for writes past the EOF.
This helps prevent timeouts when trying to write large, sparse files on
windows servers.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/readdir.c')
-rw-r--r-- | fs/cifs/readdir.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index c3c3e6286af..1a8be622833 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -239,6 +239,7 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type, if (atomic_read(&cifsInfo->inUse) == 0) atomic_set(&cifsInfo->inUse, 1); + cifsInfo->server_eof = end_of_file; spin_lock(&tmp_inode->i_lock); if (is_size_safe_to_change(cifsInfo, end_of_file)) { /* can not safely change the file size here if the @@ -375,6 +376,7 @@ static void unix_fill_in_inode(struct inode *tmp_inode, tmp_inode->i_gid = le64_to_cpu(pfindData->Gid); tmp_inode->i_nlink = le64_to_cpu(pfindData->Nlinks); + cifsInfo->server_eof = end_of_file; spin_lock(&tmp_inode->i_lock); if (is_size_safe_to_change(cifsInfo, end_of_file)) { /* can not safely change the file size here if the |