Ver Fonte

NFSv2: EOF incorrectly set on short read

In cases where the server returns fewer bytes then those requested, we
can incorrectly set the eof flag for the file. Fixing this allows the
request to be retried with updated offset and count arguments.

Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Sachin Prabhu há 13 anos atrás
pai
commit
64f9a83665
1 ficheiros alterados com 1 adições e 1 exclusões
  1. 1 1
      fs/nfs/proc.c

+ 1 - 1
fs/nfs/proc.c

@@ -651,7 +651,7 @@ static int nfs_read_done(struct rpc_task *task, struct nfs_read_data *data)
 		/* Emulate the eof flag, which isn't normally needed in NFSv2
 		/* Emulate the eof flag, which isn't normally needed in NFSv2
 		 * as it is guaranteed to always return the file attributes
 		 * as it is guaranteed to always return the file attributes
 		 */
 		 */
-		if (data->args.offset + data->args.count >= data->res.fattr->size)
+		if (data->args.offset + data->res.count >= data->res.fattr->size)
 			data->res.eof = 1;
 			data->res.eof = 1;
 	}
 	}
 	return 0;
 	return 0;