afs: Avoid endless loop if file is larger than expected

[ Upstream commit 9ea4eff4b6f4f36546d537a74da44fd3f30903ab ]

afs_read_dir fetches an amount of data that's based on what the inode
size is thought to be.  If the file on the server is larger than what
was fetched, the code rechecks i_size and retries.  If the local i_size
was not properly updated, this can lead to an endless loop of fetching
i_size from the server and noticing each time that the size is larger on
the server.

If it is known that the remote size is larger than i_size, bump up the
fetch size to that size.

Fixes: f3ddee8dc4e2 ("afs: Fix directory handling")
Signed-off-by: Marc Dionne <marc.dionne@auristor.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: linux-afs@lists.infradead.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 104df2964225c6bfdaa88ac11c5a003f4f597a26..f73b2f62afaaec960fb3b9c298d9f889d94d6e00 100644 (file)
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -274,6 +274,7 @@ static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key)
        loff_t i_size;
        int nr_pages, i;
        int ret;
+       loff_t remote_size = 0;
 
        _enter("");
 
@@ -288,6 +289,8 @@ static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key)
 
 expand:
        i_size = i_size_read(&dvnode->netfs.inode);
+       if (i_size < remote_size)
+           i_size = remote_size;
        if (i_size < 2048) {
                ret = afs_bad(dvnode, afs_file_error_dir_small);
                goto error;
@@ -363,6 +366,7 @@ expand:
                         * buffer.
                         */
                        up_write(&dvnode->validate_lock);
+                       remote_size = req->file_size;
                        goto expand;
                }