X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=lib%2Flibnfs.c;h=a134a2c5a1a2a6c1f8d331fd0e43ca1d0e0b759c;hb=ece11036ff6894f7c7d447e7a3d64c0cd49d9aa2;hp=830e28e4e2df75ec2d08e9e92641d683cb9cf9f5;hpb=20379f03fc80f4c2cb52d53103978c8141994c50;p=deb_libnfs.git

diff --git a/lib/libnfs.c b/lib/libnfs.c
index 830e28e..a134a2c 100644
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -69,6 +69,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "libnfs-zdr.h"
+#include "slist.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"
@@ -76,16 +77,33 @@
 #include "libnfs-raw-portmap.h"
 #include "libnfs-private.h"
 
+#define MAX_DIR_CACHE 128
+
 struct nfsdir {
+       struct nfs_fh3 fh;
+       fattr3 attr;
+       struct nfsdir *next;
+
        struct nfsdirent *entries;
        struct nfsdirent *current;
 };
 
+struct nfs_readahead {
+       uint64_t fh_offset;
+       uint64_t last_offset;
+       uint64_t buf_offset;
+       uint64_t buf_count;
+       time_t buf_ts;
+       void *buf;
+       uint32_t cur_ra;
+};
+
 struct nfsfh {
        struct nfs_fh3 fh;
        int is_sync;
        int is_append;
        uint64_t offset;
+       struct nfs_readahead ra;
 };
 
 struct nfs_context {
@@ -96,6 +114,7 @@ struct nfs_context {
        uint64_t readmax;
        uint64_t writemax;
        char *cwd;
+       struct nfsdir *dircache;
 };
 
 void nfs_free_nfsdir(struct nfsdir *nfsdir)
@@ -108,9 +127,39 @@ void nfs_free_nfsdir(struct nfsdir *nfsdir)
 		free(nfsdir->entries);
 		nfsdir->entries = dirent;
 	}
+	free(nfsdir->fh.data.data_val);
 	free(nfsdir);
 }
 
+static void nfs_dircache_add(struct nfs_context *nfs, struct nfsdir *nfsdir)
+{
+	int i;
+	LIBNFS_LIST_ADD(&nfs->dircache, nfsdir);
+
+	for (nfsdir = nfs->dircache, i = 0; nfsdir; nfsdir = nfsdir->next, i++) {
+		if (i > MAX_DIR_CACHE) {
+			LIBNFS_LIST_REMOVE(&nfs->dircache, nfsdir);
+			nfs_free_nfsdir(nfsdir);
+			break;
+		}
+	}
+}
+
+static struct nfsdir *nfs_dircache_find(struct nfs_context *nfs, struct nfs_fh3 *fh)
+{
+	struct nfsdir *nfsdir;
+
+	for (nfsdir = nfs->dircache; nfsdir; nfsdir = nfsdir->next) {
+		if (nfsdir->fh.data.data_len == fh->data.data_len &&
+		    !memcmp(nfsdir->fh.data.data_val, fh->data.data_val, fh->data.data_len)) {
+			LIBNFS_LIST_REMOVE(&nfs->dircache, nfsdir);
+			return nfsdir;
+		}
+	}
+
+	return NULL;
+}
+
 struct nfs_cb_data;
 typedef int (*continue_func)(struct nfs_context *nfs, fattr3 *attr,
 			     struct nfs_cb_data *data);
@@ -135,9 +184,8 @@ struct nfs_cb_data {
        int cancel;
        int oom;
        int num_calls;
-       uint64_t start_offset, max_offset, count;
+       uint64_t offset, count, max_offset, org_offset, org_count;
        char *buffer;
-       size_t request_size;
        char *usrbuf;
 };
 
@@ -182,12 +230,14 @@ char *nfs_get_error(struct nfs_context *nfs)
 
 static int nfs_set_context_args(struct nfs_context *nfs, char *arg, char *val)
 {
-	if (!strncmp(arg, "tcp-syncnt", 10)) {
+	if (!strcmp(arg, "tcp-syncnt")) {
 		rpc_set_tcp_syncnt(nfs_get_rpc_context(nfs), atoi(val));
-	} else if (!strncmp(arg, "uid", 3)) {
+	} else if (!strcmp(arg, "uid")) {
 		rpc_set_uid(nfs_get_rpc_context(nfs), atoi(val));
-	} else if (!strncmp(arg, "gid", 3)) {
+	} else if (!strcmp(arg, "gid")) {
 		rpc_set_gid(nfs_get_rpc_context(nfs), atoi(val));
+	} else if (!strcmp(arg, "readahaed")) {
+		rpc_set_readahead(nfs_get_rpc_context(nfs), atoi(val));
 	}
 	return 0;
 }
@@ -379,6 +429,12 @@ void nfs_destroy_context(struct nfs_context *nfs)
 		nfs->rootfh.data.data_val = NULL;
 	}
 
+	while (nfs->dircache) {
+		struct nfsdir *nfsdir = nfs->dircache;
+		LIBNFS_LIST_REMOVE(&nfs->dircache, nfsdir);
+		nfs_free_nfsdir(nfsdir);
+	}
+
 	free(nfs);
 }
 
@@ -640,6 +696,16 @@ static void free_nfs_cb_data(struct nfs_cb_data *data)
 	free(data);
 }
 
+static void free_nfsfh(struct nfsfh *nfsfh)
+{
+	if (nfsfh->fh.data.data_val != NULL) {
+		free(nfsfh->fh.data.data_val);
+		nfsfh->fh.data.data_val = NULL;
+	}
+	free(nfsfh->ra.buf);
+	free(nfsfh);
+}
+
 
 static void nfs_mount_10_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
 {
@@ -715,6 +781,9 @@ static void nfs_mount_8_cb(struct rpc_context *rpc, int status, void *command_da
 		return;
 	}
 
+	/* NFS TCP connections we want to autoreconnect after sessions are torn down (due to inactivity or error) */
+	rpc_set_autoreconnect(rpc);
+
 	args.fsroot = nfs->rootfh;
 	if (rpc_nfs3_fsinfo_async(rpc, nfs_mount_9_cb, &args, data) != 0) {
 		data->cb(-ENOMEM, nfs, command_data, data->private_data);
@@ -767,9 +836,6 @@ static void nfs_mount_6_cb(struct rpc_context *rpc, int status, void *command_da
 		free_nfs_cb_data(data);
 		return;
 	}
-
-	/* NFS TCP connections we want to autoreconnect after sessions are torn down (due to inactivity or error) */
-	rpc_set_autoreconnect(rpc);
 }
 
 
@@ -1193,8 +1259,8 @@ static void nfs_stat_1_cb(struct rpc_context *rpc, int status, void *command_dat
         st.st_rdev    = 0;
         st.st_size    = res->GETATTR3res_u.resok.obj_attributes.size;
 #ifndef WIN32
-        st.st_blksize = 4096;
-        st.st_blocks  = res->GETATTR3res_u.resok.obj_attributes.size / 4096;
+        st.st_blksize = NFS_BLKSIZE;
+        st.st_blocks  = res->GETATTR3res_u.resok.obj_attributes.size / NFS_BLKSIZE;
 #endif//WIN32
         st.st_atime   = res->GETATTR3res_u.resok.obj_attributes.atime.seconds;
         st.st_mtime   = res->GETATTR3res_u.resok.obj_attributes.mtime.seconds;
@@ -1577,9 +1643,9 @@ static void nfs_pread_mcb(struct rpc_context *rpc, int status, void *command_dat
 			/* if we have more than one call or we have received a short read we need a reassembly buffer */
 			if (data->num_calls || (count < mdata->count && !res->READ3res_u.resok.eof)) {
 				if (data->buffer == NULL) {
-					data->buffer = 	malloc(data->request_size);
+					data->buffer = 	malloc(data->count);
 					if (data->buffer == NULL) {
-						rpc_set_error(nfs->rpc, "Out-Of-Memory: Failed to allocate reassembly buffer for %d bytes", (int)data->request_size);
+						rpc_set_error(nfs->rpc, "Out-Of-Memory: Failed to allocate reassembly buffer for %d bytes", (int)data->count);
 						data->oom = 1;
 					}
 				}
@@ -1588,7 +1654,7 @@ static void nfs_pread_mcb(struct rpc_context *rpc, int status, void *command_dat
 				if (count <= mdata->count) {
 					/* copy data into reassembly buffer if we have one */
 					if (data->buffer != NULL) {
-						memcpy(&data->buffer[mdata->offset - data->start_offset], res->READ3res_u.resok.data.data_val, count);
+						memcpy(&data->buffer[mdata->offset - data->offset], res->READ3res_u.resok.data.data_val, count);
 					}
 					if (data->max_offset < mdata->offset + count) {
 						data->max_offset = mdata->offset + count;
@@ -1644,14 +1710,35 @@ static void nfs_pread_mcb(struct rpc_context *rpc, int status, void *command_dat
 	}
 
 	if (data->buffer) {
-		data->cb(data->max_offset - data->start_offset, nfs, data->buffer, data->private_data);
+		if (data->max_offset > data->org_offset + data->org_count) {
+			data->max_offset = data->org_offset + data->org_count;
+		}
+		data->cb(data->max_offset - data->org_offset, nfs, data->buffer + (data->org_offset - data->offset), data->private_data);
 	} else {
 		data->cb(res->READ3res_u.resok.count, nfs, res->READ3res_u.resok.data.data_val, data->private_data);
 	}
 
+	data->nfsfh->ra.fh_offset = data->max_offset;
+	if (data->nfsfh->ra.cur_ra) {
+		free(data->nfsfh->ra.buf);
+		data->nfsfh->ra.buf = data->buffer;
+		data->nfsfh->ra.buf_offset = data->offset;
+		data->nfsfh->ra.buf_count = data->count;
+		data->nfsfh->ra.buf_ts = time(NULL);
+		data->buffer = NULL;
+	}
 	free_nfs_cb_data(data);
 }
 
+static void nfs_ra_invalidate(struct nfsfh *nfsfh) {
+	free(nfsfh->ra.buf);
+	nfsfh->ra.buf = NULL;
+	nfsfh->ra.buf_offset = 0;
+	nfsfh->ra.buf_count = 0;
+	nfsfh->ra.buf_ts = time(NULL);
+	nfsfh->ra.cur_ra = NFS_BLKSIZE;
+}
+
 static int nfs_pread_async_internal(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t offset, uint64_t count, nfs_cb cb, void *private_data, int update_pos)
 {
 	struct nfs_cb_data *data;
@@ -1666,16 +1753,78 @@ static int nfs_pread_async_internal(struct nfs_context *nfs, struct nfsfh *nfsfh
 	data->cb           = cb;
 	data->private_data = private_data;
 	data->nfsfh        = nfsfh;
-	data->request_size = count;
+	data->org_offset   = offset;
+	data->org_count    = count;
 
 	assert(data->num_calls == 0);
 
+	if (nfs->rpc->readahead && time(NULL) - nfsfh->ra.buf_ts > NFS_RA_TIMEOUT) {
+		/* readahead cache timeout */
+		nfs_ra_invalidate(nfsfh);
+	}
+
+	if (nfs->rpc->readahead) {
+		if (offset >= nfsfh->ra.last_offset &&
+			offset - NFS_BLKSIZE <= nfsfh->ra.fh_offset + nfsfh->ra.cur_ra) {
+			if (nfs->rpc->readahead > nfsfh->ra.cur_ra) {
+				nfsfh->ra.cur_ra <<= 1;
+			}
+		} else {
+			nfsfh->ra.cur_ra = NFS_BLKSIZE;
+		}
+
+		nfsfh->ra.last_offset = offset;
+
+		if (nfsfh->ra.buf_offset <= offset &&
+			nfsfh->ra.buf_offset + nfsfh->ra.buf_count >= offset + count) {
+			/* serve request completely from cache */
+			data->buffer = malloc(count);
+			if (data->buffer == NULL) {
+				free_nfs_cb_data(data);
+				return -ENOMEM;
+			}
+			memcpy(data->buffer, nfsfh->ra.buf + (offset - nfsfh->ra.buf_offset), count);
+			data->cb(count, nfs, data->buffer, data->private_data);
+			nfsfh->ra.fh_offset = offset + count;
+			free_nfs_cb_data(data);
+			return 0;
+		}
+
+		/* align start offset to blocksize */
+		count += offset & (NFS_BLKSIZE - 1);
+		offset &= ~(NFS_BLKSIZE - 1);
+
+		/* align end offset to blocksize and add readahead */
+		count += nfsfh->ra.cur_ra - 1;
+		count &= ~(NFS_BLKSIZE - 1);
+
+		data->buffer = malloc(count);
+		if (data->buffer == NULL) {
+			free_nfs_cb_data(data);
+			return -ENOMEM;
+		}
+		data->offset = offset;
+		data->count = count;
+
+		if (nfsfh->ra.buf_count && nfsfh->ra.buf_offset <= offset &&
+			nfsfh->ra.buf_offset + nfsfh->ra.buf_count >= offset) {
+			/* serve request partially from cache */
+			size_t overlap = (nfsfh->ra.buf_offset + nfsfh->ra.buf_count) - offset;
+			if (overlap > count) count = overlap;
+			memcpy(data->buffer, nfsfh->ra.buf + (offset - nfsfh->ra.buf_offset), overlap);
+			offset += overlap;
+			count -= overlap;
+		}
+	} else {
+		data->offset = offset;
+		data->count = count;
+	}
+
+	data->max_offset = offset;
+
 	/* chop requests into chunks of at most READMAX bytes if necessary.
 	 * we send all reads in parallel so that performance is still good.
 	 */
-	data->max_offset = offset;
-	data->start_offset = offset;
-
 	do {
 		uint64_t readcount = count;
 		struct nfs_mcb_data *mdata;
@@ -1794,7 +1943,7 @@ static void nfs_pwrite_mcb(struct rpc_context *rpc, int status, void *command_da
 					mdata->count -= count;
 
 					nfs_fill_WRITE3args(&args, data->nfsfh, mdata->offset, mdata->count,
-										&data->usrbuf[mdata->offset - data->start_offset]);
+										&data->usrbuf[mdata->offset - data->offset]);
 					if (rpc_nfs3_write_async(nfs->rpc, nfs_pwrite_mcb, &args, mdata) == 0) {
 						data->num_calls++;
 						return;
@@ -1834,7 +1983,7 @@ static void nfs_pwrite_mcb(struct rpc_context *rpc, int status, void *command_da
 		return;
 	}
 
-	data->cb(data->max_offset - data->start_offset, nfs, NULL, data->private_data);
+	data->cb(data->max_offset - data->offset, nfs, NULL, data->private_data);
 
 	free_nfs_cb_data(data);
 }
@@ -1863,7 +2012,7 @@ static int nfs_pwrite_async_internal(struct nfs_context *nfs, struct nfsfh *nfsf
 	 * we send all writes in parallel so that performance is still good.
 	 */
 	data->max_offset = offset;
-	data->start_offset = offset;
+	data->offset = offset;
 
 	do {
 		uint64_t writecount = count;
@@ -1890,7 +2039,7 @@ static int nfs_pwrite_async_internal(struct nfs_context *nfs, struct nfsfh *nfsf
 		mdata->count  = writecount;
 		mdata->update_pos = update_pos;
 
-		nfs_fill_WRITE3args(&args, nfsfh, offset, writecount, &buf[offset - data->start_offset]);
+		nfs_fill_WRITE3args(&args, nfsfh, offset, writecount, &buf[offset - data->offset]);
 
 		if (rpc_nfs3_write_async(nfs->rpc, nfs_pwrite_mcb, &args, mdata) != 0) {
 			rpc_set_error(nfs->rpc, "RPC error: Failed to send WRITE call for %s", data->path);
@@ -1956,6 +2105,7 @@ static void nfs_write_append_cb(struct rpc_context *rpc, int status, void *comma
 
 int nfs_write_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t count, char *buf, nfs_cb cb, void *private_data)
 {
+	nfs_ra_invalidate(nfsfh);
 	if (nfsfh->is_append) {
 		struct GETATTR3args args;
 		struct nfs_cb_data *data;
@@ -1995,12 +2145,7 @@ int nfs_write_async(struct nfs_context *nfs, struct nfsfh *nfsfh, uint64_t count
 
 int nfs_close_async(struct nfs_context *nfs, struct nfsfh *nfsfh, nfs_cb cb, void *private_data)
 {
-	if (nfsfh->fh.data.data_val != NULL){
-		free(nfsfh->fh.data.data_val);
-		nfsfh->fh.data.data_val = NULL;
-	}
-	free(nfsfh);
-
+	free_nfsfh(nfsfh);
 	cb(0, nfs, NULL, private_data);
 	return 0;
 };
@@ -2386,13 +2531,63 @@ int nfs_rmdir_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void *
 /*
  * Async creat()
  */
+struct create_cb_data {
+       char *path;
+       int flags;
+       int mode;
+};
+
+static void free_create_cb_data(void *ptr)
+{
+	struct create_cb_data *data = ptr;
+
+	free(data->path);
+	free(data);
+}
+
+static void nfs_create_trunc_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
+{
+	struct nfs_cb_data *data = private_data;
+	struct nfs_context *nfs = data->nfs;
+	struct nfsfh *nfsfh;
+	SETATTR3res *res;
+
+	assert(rpc->magic == RPC_CONTEXT_MAGIC);
+
+	if (status == RPC_STATUS_ERROR) {
+		data->cb(-EFAULT, nfs, command_data, data->private_data);
+		free_nfs_cb_data(data);
+		free_nfsfh(nfsfh);
+		return;
+	}
+	if (status == RPC_STATUS_CANCEL) {
+		data->cb(-EINTR, nfs, "Command was cancelled", data->private_data);
+		free_nfs_cb_data(data);
+		free_nfsfh(nfsfh);
+		return;
+	}
+
+	res = command_data;
+	if (res->status != NFS3_OK) {
+		rpc_set_error(nfs->rpc, "NFS: Setattr failed with %s(%d)", nfsstat3_to_str(res->status), nfsstat3_to_errno(res->status));
+		data->cb(nfsstat3_to_errno(res->status), nfs, rpc_get_error(nfs->rpc), data->private_data);
+		free_nfs_cb_data(data);
+		free_nfsfh(nfsfh);
+		return;
+	}
+
+	data->cb(0, nfs, data->nfsfh, data->private_data);
+	free_nfs_cb_data(data);
+}
+
 static void nfs_create_2_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
 {
 	LOOKUP3res *res;
 	struct nfs_cb_data *data = private_data;
 	struct nfs_context *nfs = data->nfs;
 	struct nfsfh *nfsfh;
-	char *str = data->continue_data;
+	struct create_cb_data *cb_data = data->continue_data;
+	char *str = cb_data->path;
 
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
 
@@ -2425,23 +2620,62 @@ static void nfs_create_2_cb(struct rpc_context *rpc, int status, void *command_d
 	}
 	memset(nfsfh, 0, sizeof(struct nfsfh));
 
+	if (cb_data->flags & O_SYNC) {
+		nfsfh->is_sync = 1;
+	}
+	if (cb_data->flags & O_APPEND) {
+		nfsfh->is_append = 1;
+	}
+
 	/* copy the filehandle */
 	nfsfh->fh.data.data_len = res->LOOKUP3res_u.resok.object.data.data_len;
 	nfsfh->fh.data.data_val = malloc(nfsfh->fh.data.data_len);
+	if (nfsfh->fh.data.data_val == NULL) {
+		rpc_set_error(nfs->rpc, "Out of memory: Failed to allocate fh structure");
+		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
+		free_nfs_cb_data(data);
+		free(nfsfh);
+		return -1;
+	}
 	memcpy(nfsfh->fh.data.data_val, res->LOOKUP3res_u.resok.object.data.data_val, nfsfh->fh.data.data_len);
 
+	/* Try to truncate it if we were requested to */
+	if (cb_data->flags & O_TRUNC) {
+		SETATTR3args args;
+
+		data->nfsfh = nfsfh;
+
+		memset(&args, 0, sizeof(SETATTR3args));
+		args.object = nfsfh->fh;
+		args.new_attributes.size.set_it = 1;
+		args.new_attributes.size.set_size3_u.size = 0;
+
+		if (rpc_nfs3_setattr_async(nfs->rpc, nfs_create_trunc_cb,
+				&args, data) != 0) {
+			rpc_set_error(nfs->rpc, "RPC error: Failed to send "
+				"SETATTR call for %s", data->path);
+			data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc),
+				data->private_data);
+			free_nfs_cb_data(data);
+			free_nfsfh(nfsfh);
+			return;
+		}
+		return;
+	}
+
 	data->cb(0, nfs, nfsfh, data->private_data);
 	free_nfs_cb_data(data);
 }
 
 
 
-static void nfs_creat_1_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
+static void nfs_create_1_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data)
 {
 	CREATE3res *res;
 	struct nfs_cb_data *data = private_data;
 	struct nfs_context *nfs = data->nfs;
-	char *str = data->continue_data;
+	struct create_cb_data *cb_data = data->continue_data;
+	char *str = cb_data->path;
 	LOOKUP3args args;
 
 	assert(rpc->magic == RPC_CONTEXT_MAGIC);
@@ -2479,9 +2713,10 @@ static void nfs_creat_1_cb(struct rpc_context *rpc, int status, void *command_da
 	return;
 }
 
-static int nfs_creat_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_, struct nfs_cb_data *data)
+static int nfs_create_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_, struct nfs_cb_data *data)
 {
-	char *str = data->continue_data;
+	struct create_cb_data *cb_data = data->continue_data;
+	char *str = cb_data->path;
 	CREATE3args args;
 
 	str = &str[strlen(str) + 1];
@@ -2489,11 +2724,11 @@ static int nfs_creat_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_
 	memset(&args, 0, sizeof(CREATE3args));
 	args.where.dir = data->fh;
 	args.where.name = str;
-	args.how.mode = UNCHECKED;
+	args.how.mode = (cb_data->flags & O_EXCL) ? GUARDED : UNCHECKED;
 	args.how.createhow3_u.obj_attributes.mode.set_it = 1;
-	args.how.createhow3_u.obj_attributes.mode.set_mode3_u.mode = data->continue_int;
+	args.how.createhow3_u.obj_attributes.mode.set_mode3_u.mode = cb_data->mode;
 
-	if (rpc_nfs3_create_async(nfs->rpc, nfs_creat_1_cb, &args, data) != 0) {
+	if (rpc_nfs3_create_async(nfs->rpc, nfs_create_1_cb, &args, data) != 0) {
 		rpc_set_error(nfs->rpc, "RPC error: Failed to send CREATE call for %s/%s", data->path, str);
 		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
 		free_nfs_cb_data(data);
@@ -2502,27 +2737,37 @@ static int nfs_creat_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_
 	return 0;
 }
 
-int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb cb, void *private_data)
+int nfs_create_async(struct nfs_context *nfs, const char *path, int flags, int mode, nfs_cb cb, void *private_data)
 {
-	char *new_path;
+	struct create_cb_data *cb_data;
 	char *ptr;
 
-	new_path = strdup(path);
-	if (new_path == NULL) {
+	cb_data = malloc(sizeof(struct create_cb_data));
+	if (cb_data == NULL) {
+		rpc_set_error(nfs->rpc, "Out of memory, failed to allocate mode buffer for cb data");
+		return -1;
+	}
+
+	cb_data->path = strdup(path);
+	if (cb_data->path == NULL) {
 		rpc_set_error(nfs->rpc, "Out of memory, failed to allocate mode buffer for path");
+		free(cb_data);
 		return -1;
 	}
 
-	ptr = strrchr(new_path, '/');
+	ptr = strrchr(cb_data->path, '/');
 	if (ptr == NULL) {
 		rpc_set_error(nfs->rpc, "Invalid path %s", path);
-		free(new_path);
+		free_create_cb_data(cb_data);
 		return -1;
 	}
 	*ptr = 0;
 
+	cb_data->flags = flags;
+	cb_data->mode = mode;
+
 	/* new_path now points to the parent directory,  and beyond the nul terminator is the new directory to create */
-	if (nfs_lookuppath_async(nfs, new_path, cb, private_data, nfs_creat_continue_internal, new_path, free, mode) != 0) {
+	if (nfs_lookuppath_async(nfs, cb_data->path, cb, private_data, nfs_create_continue_internal, cb_data, free_create_cb_data, 0) != 0) {
 		rpc_set_error(nfs->rpc, "Out of memory: failed to start parsing the path components");
 		return -1;
 	}
@@ -2530,6 +2775,11 @@ int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb
 	return 0;
 }
 
+int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb cb, void *private_data)
+{
+	return nfs_create_async(nfs, path, 0, mode, cb, private_data);
+}
+
 
 
 
@@ -2817,6 +3067,7 @@ static void nfs_opendir3_cb(struct rpc_context *rpc, int status, void *command_d
 			nfsdirent->ctime.tv_usec = attributes->ctime.nseconds/1000;
 			nfsdirent->uid = attributes->uid;
 			nfsdirent->gid = attributes->gid;
+			nfsdirent->nlink = attributes->nlink;
 		}
 	}
 
@@ -2923,6 +3174,9 @@ static void nfs_opendir2_cb(struct rpc_context *rpc, int status, void *command_d
 		return;
 	}
 
+	if (res->READDIR3res_u.resok.dir_attributes.attributes_follow)
+		nfsdir->attr = res->READDIR3res_u.resok.dir_attributes.post_op_attr_u.attributes;
+
 	/* steal the dirhandle */
 	nfsdir->current = nfsdir->entries;
 
@@ -3054,6 +3308,7 @@ static void nfs_opendir_cb(struct rpc_context *rpc, int status, void *command_da
 			nfsdirent->ctime.tv_usec = entry->name_attributes.post_op_attr_u.attributes.ctime.nseconds/1000;
 			nfsdirent->uid = entry->name_attributes.post_op_attr_u.attributes.uid;
 			nfsdirent->gid = entry->name_attributes.post_op_attr_u.attributes.gid;
+			nfsdirent->nlink = entry->name_attributes.post_op_attr_u.attributes.nlink;
 		}
 
 		nfsdirent->next  = nfsdir->entries;
@@ -3083,6 +3338,9 @@ static void nfs_opendir_cb(struct rpc_context *rpc, int status, void *command_da
 		return;
 	}
 
+	if (res->READDIRPLUS3res_u.resok.dir_attributes.attributes_follow)
+		nfsdir->attr = res->READDIRPLUS3res_u.resok.dir_attributes.post_op_attr_u.attributes;
+
 	/* steal the dirhandle */
 	data->continue_data = NULL;
 	nfsdir->current = nfsdir->entries;
@@ -3094,6 +3352,31 @@ static void nfs_opendir_cb(struct rpc_context *rpc, int status, void *command_da
 static int nfs_opendir_continue_internal(struct nfs_context *nfs, fattr3 *attr _U_, struct nfs_cb_data *data)
 {
 	READDIRPLUS3args args;
+	struct nfsdir *nfsdir = data->continue_data;;
+	struct nfsdir *cached;
+
+	cached = nfs_dircache_find(nfs, &data->fh);
+	if (cached) {
+		if (attr && attr->mtime.seconds == cached->attr.mtime.seconds) {
+			cached->current = cached->entries;
+			data->cb(0, nfs, cached, data->private_data);
+			free_nfs_cb_data(data);
+			return 0;
+		} else {
+			/* cache must be stale */
+			nfs_free_nfsdir(cached);
+		}
+	}
+
+	nfsdir->fh.data.data_len  = data->fh.data.data_len;
+	nfsdir->fh.data.data_val = malloc(nfsdir->fh.data.data_len);
+	if (nfsdir->fh.data.data_val == NULL) {
+		rpc_set_error(nfs->rpc, "OOM when allocating fh for nfsdir");
+		data->cb(-ENOMEM, nfs, rpc_get_error(nfs->rpc), data->private_data);
+		free_nfs_cb_data(data);
+		return -1;
+	}
+	memcpy(nfsdir->fh.data.data_val, data->fh.data.data_val, data->fh.data.data_len);
 
 	args.dir = data->fh;
 	args.cookie = 0;
@@ -3143,9 +3426,9 @@ struct nfsdirent *nfs_readdir(struct nfs_context *nfs _U_, struct nfsdir *nfsdir
 /*
  * closedir()
  */
-void nfs_closedir(struct nfs_context *nfs _U_, struct nfsdir *nfsdir)
+void nfs_closedir(struct nfs_context *nfs, struct nfsdir *nfsdir)
 {
-	nfs_free_nfsdir(nfsdir);
+	nfs_dircache_add(nfs, nfsdir);
 }
 
 
@@ -3294,11 +3577,11 @@ static void nfs_statvfs_1_cb(struct rpc_context *rpc, int status, void *command_
 		return;
 	}
 
-	svfs.f_bsize   = 4096;
-	svfs.f_frsize  = 4096;
-	svfs.f_blocks  = res->FSSTAT3res_u.resok.tbytes/4096;
-	svfs.f_bfree   = res->FSSTAT3res_u.resok.fbytes/4096;
-	svfs.f_bavail  = res->FSSTAT3res_u.resok.abytes/4096;
+	svfs.f_bsize   = NFS_BLKSIZE;
+	svfs.f_frsize  = NFS_BLKSIZE;
+	svfs.f_blocks  = res->FSSTAT3res_u.resok.tbytes/NFS_BLKSIZE;
+	svfs.f_bfree   = res->FSSTAT3res_u.resok.fbytes/NFS_BLKSIZE;
+	svfs.f_bavail  = res->FSSTAT3res_u.resok.abytes/NFS_BLKSIZE;
 	svfs.f_files   = res->FSSTAT3res_u.resok.tfiles;
 	svfs.f_ffree   = res->FSSTAT3res_u.resok.ffiles;
 #if !defined(ANDROID)
@@ -4336,6 +4619,10 @@ void nfs_set_gid(struct nfs_context *nfs, int gid) {
 	rpc_set_gid(nfs->rpc, gid);
 }
 
+void nfs_set_readahead(struct nfs_context *nfs, uint32_t v) {
+	rpc_set_readahead(nfs->rpc, v);
+}
+
 void nfs_set_error(struct nfs_context *nfs, char *error_string, ...)
 {
         va_list ap;