Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/http-fetch.c b/http-fetch.c
index 557b40322f22b77a81140ff8f29b2b2be0505581..202fae0ba8b348aeca6ec6c61045f39aa0d1fa66 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -198,7 +198,7 @@ static void start_object_request(struct object_request *obj_req)
                SHA1_Init(&obj_req->c);
                if (prev_posn>0) {
                        prev_posn = 0;
-                       lseek(obj_req->local, SEEK_SET, 0);
+                       lseek(obj_req->local, 0, SEEK_SET);
                        ftruncate(obj_req->local, 0);
                }
        }
@@ -828,7 +828,7 @@ static void abort_object_request(struct object_request *obj_req)
        }
        unlink(obj_req->tmpfile);
        if (obj_req->slot) {
-               release_active_slot(obj_req->slot);
+               release_active_slot(obj_req->slot);
                obj_req->slot = NULL;
        }
        release_object_request(obj_req);