tdb2: try to fit transactions in existing space before we expand.

[ccan] / ccan / nfs / nfs.c

diff --git a/ccan/nfs/nfs.c b/ccan/nfs/nfs.c
index 6d3e82f914a327dc097c28eee02dd4dbb825916e..684ce3500014e2919aff2e3692791f35676f4da4 100644 (file)
--- a/ccan/nfs/nfs.c
+++ b/ccan/nfs/nfs.c
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) by Ronnie Sahlberg <ronniesahlberg@gmail.com> 2010
    
    This program is free software; you can redistribute it and/or modify
@@ -19,10 +19,10 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <rpc/xdr.h>
-#include "libnfs.h"
+#include "nfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
-#include "libnfs-raw-nfs.h"
+#include "rpc/nfs.h"
 
 
 
@@ -129,8 +129,8 @@ int rpc_nfs_getattr_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh
                return -1;
        }
 
-       args.object.data.data_len = fh->data.data_len; 
-       args.object.data.data_val = fh->data.data_val; 
+       args.object.data.data_len = fh->data.data_len;
+       args.object.data.data_val = fh->data.data_val;
 
        if (xdr_GETATTR3args(&pdu->xdr, &args) == 0) {
                rpc_set_error(rpc, "XDR error: Failed to encode GETATTR3args");
@@ -158,8 +158,8 @@ int rpc_nfs_lookup_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
                return -1;
        }
 
-       args.what.dir.data.data_len = fh->data.data_len; 
-       args.what.dir.data.data_val = fh->data.data_val; 
+       args.what.dir.data.data_len = fh->data.data_len;
+       args.what.dir.data.data_val = fh->data.data_val;
        args.what.name              = name;
 
        if (xdr_LOOKUP3args(&pdu->xdr, &args) == 0) {
@@ -210,7 +210,7 @@ int rpc_nfs_access_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
 
 
 
-int rpc_nfs_read_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, off_t offset, size_t count, void *private_data)
+int rpc_nfs_read_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, nfs_off_t offset, size_t count, void *private_data)
 {
        struct rpc_pdu *pdu;
        READ3args args;
@@ -242,7 +242,7 @@ int rpc_nfs_read_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, o
 }
 
 
-int rpc_nfs_write_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, char *buf, off_t offset, size_t count, int stable_how, void *private_data)
+int rpc_nfs_write_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh, char *buf, nfs_off_t offset, size_t count, int stable_how, void *private_data)
 {
        struct rpc_pdu *pdu;
        WRITE3args args;
@@ -490,7 +490,7 @@ int rpc_nfs_readdir_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh
        args.dir.data.data_len = fh->data.data_len;
        args.dir.data.data_val = fh->data.data_val;
        args.cookie = cookie;
-       memcpy(&args.cookieverf, cookieverf, sizeof(cookieverf3)); 
+       memcpy(&args.cookieverf, cookieverf, sizeof(cookieverf3));
        args.count = count;
 
        if (xdr_READDIR3args(&pdu->xdr, &args) == 0) {
@@ -519,8 +519,8 @@ int rpc_nfs_fsstat_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *fh,
                return -1;
        }
 
-       args.fsroot.data.data_len = fh->data.data_len; 
-       args.fsroot.data.data_val = fh->data.data_val; 
+       args.fsroot.data.data_len = fh->data.data_len;
+       args.fsroot.data.data_val = fh->data.data_val;
 
        if (xdr_FSSTAT3args(&pdu->xdr, &args) == 0) {
                rpc_set_error(rpc, "XDR error: Failed to encode FSSTAT3args");
@@ -549,8 +549,8 @@ int rpc_nfs_readlink_async(struct rpc_context *rpc, rpc_cb cb, struct nfs_fh3 *f
                return -1;
        }
 
-       args.symlink.data.data_len = fh->data.data_len; 
-       args.symlink.data.data_val = fh->data.data_val; 
+       args.symlink.data.data_len = fh->data.data_len;
+       args.symlink.data.data_val = fh->data.data_val;
 
        if (xdr_READLINK3args(&pdu->xdr, &args) == 0) {
                rpc_set_error(rpc, "XDR error: Failed to encode READLINK3args");