From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Sat, 18 Jun 2011 05:07:53 +0000 (+1000)
Subject: Remove the _sync  postfix for the synchronous functions
X-Git-Tag: upstream/1.9.6^2~402
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=e2ba5764d46b29756973fdb20332a8fcfb5bbfd1;p=deb_libnfs.git

Remove the _sync  postfix for the synchronous functions
---

diff --git a/examples/nfsclient-sync.c b/examples/nfsclient-sync.c
index a6794ee..d1c70a2 100644
--- a/examples/nfsclient-sync.c
+++ b/examples/nfsclient-sync.c
@@ -66,7 +66,7 @@ int main(int argc _U_, char *argv[] _U_)
 		exit(10);
 	}
 
-	ret = nfs_mount_sync(nfs, client.server, client.export);
+	ret = nfs_mount(nfs, client.server, client.export);
 	if (ret != 0) {
  		printf("Failed to mount nfs share : %s\n", nfs_get_error(nfs));
 		exit(10);
@@ -74,7 +74,7 @@ int main(int argc _U_, char *argv[] _U_)
 	printf("mounted share successfully\n");
 
 
-	ret = nfs_stat_sync(nfs, NFSFILE, &st);
+	ret = nfs_stat(nfs, NFSFILE, &st);
 	if (ret != 0) {
 		printf("Failed to stat(%s) %s\n", NFSFILE, nfs_get_error(nfs));
 		exit(10);
@@ -83,13 +83,13 @@ int main(int argc _U_, char *argv[] _U_)
 	printf("Size %d\n", (int)st.st_size);
 	printf("Inode %04o\n", (int)st.st_ino);
 
-	ret = nfs_open_sync(nfs, NFSFILE, O_RDONLY, &nfsfh);
+	ret = nfs_open(nfs, NFSFILE, O_RDONLY, &nfsfh);
 	if (ret != 0) {
 		printf("Failed to open(%s) %s\n", NFSFILE, nfs_get_error(nfs));
 		exit(10);
 	}
 
-	ret = nfs_read_sync(nfs, nfsfh, 16, buf);
+	ret = nfs_read(nfs, nfsfh, 16, buf);
 	if (ret < 0) {
 		printf("Failed to pread(%s) %s\n", NFSFILE, nfs_get_error(nfs));
 		exit(10);
@@ -99,7 +99,7 @@ int main(int argc _U_, char *argv[] _U_)
 		printf("%02x ", buf[i]&0xff);
 	}
 	printf("\n");
-	ret = nfs_read_sync(nfs, nfsfh, 16, buf);
+	ret = nfs_read(nfs, nfsfh, 16, buf);
 	if (ret < 0) {
 		printf("Failed to pread(%s) %s\n", NFSFILE, nfs_get_error(nfs));
 		exit(10);
@@ -110,7 +110,7 @@ int main(int argc _U_, char *argv[] _U_)
 	}
 	printf("\n");
 
-	ret = (int)nfs_lseek_sync(nfs, nfsfh, 0, SEEK_CUR, &offset);
+	ret = (int)nfs_lseek(nfs, nfsfh, 0, SEEK_CUR, &offset);
 	if (ret < 0) {
 		printf("Failed to lseek(%s) %s\n", NFSFILE, nfs_get_error(nfs));
 		exit(10);
@@ -118,14 +118,14 @@ int main(int argc _U_, char *argv[] _U_)
 	printf("File position is %d\n", (int)offset);
 
 	printf("seek to end of file\n");
-	ret = (int)nfs_lseek_sync(nfs, nfsfh, 0, SEEK_END, &offset);
+	ret = (int)nfs_lseek(nfs, nfsfh, 0, SEEK_END, &offset);
 	if (ret < 0) {
 		printf("Failed to lseek(%s) %s\n", NFSFILE, nfs_get_error(nfs));
 		exit(10);
 	}
 	printf("File position is %d\n", (int)offset);
 
-	ret = nfs_fstat_sync(nfs, nfsfh, &st);
+	ret = nfs_fstat(nfs, nfsfh, &st);
 	if (ret != 0) {
 		printf("Failed to stat(%s) %s\n", NFSFILE, nfs_get_error(nfs));
 		exit(10);
@@ -135,13 +135,13 @@ int main(int argc _U_, char *argv[] _U_)
 	printf("Inode %04o\n", (int)st.st_ino);
 
 
-	ret = nfs_close_sync(nfs, nfsfh);
+	ret = nfs_close(nfs, nfsfh);
 	if (ret < 0) {
 		printf("Failed to close(%s): %s\n", NFSFILE, nfs_get_error(nfs));
 		exit(10);
 	}
 
-	ret = nfs_opendir_sync(nfs, NFSDIR, &nfsdir);
+	ret = nfs_opendir(nfs, NFSDIR, &nfsdir);
 	if (ret != 0) {
 		printf("Failed to open(%s) %s\n", NFSFILE, nfs_get_error(nfs));
 		exit(10);
@@ -152,29 +152,29 @@ int main(int argc _U_, char *argv[] _U_)
 	nfs_closedir(nfs, nfsdir);
 
 
-	ret = nfs_open_sync(nfs, NFSFILEW, O_WRONLY, &nfsfh);
+	ret = nfs_open(nfs, NFSFILEW, O_WRONLY, &nfsfh);
 	if (ret != 0) {
 		printf("Failed to open(%s) %s\n", NFSFILEW, nfs_get_error(nfs));
 		exit(10);
 	}
-	ret = nfs_pwrite_sync(nfs, nfsfh, 0, 16, buf);
+	ret = nfs_pwrite(nfs, nfsfh, 0, 16, buf);
 	if (ret < 0) {
 		printf("Failed to pwrite(%s) %s\n", NFSFILEW, nfs_get_error(nfs));
 		exit(10);
 	}
-	ret = nfs_fsync_sync(nfs, nfsfh);
+	ret = nfs_fsync(nfs, nfsfh);
 	if (ret < 0) {
 		printf("Failed to fsync(%s) %s\n", NFSFILEW, nfs_get_error(nfs));
 		exit(10);
 	}
-	ret = nfs_close_sync(nfs, nfsfh);
+	ret = nfs_close(nfs, nfsfh);
 	if (ret < 0) {
 		printf("Failed to close(%s) %s\n", NFSFILEW, nfs_get_error(nfs));
 		exit(10);
 	}
 
 
-	ret = nfs_statvfs_sync(nfs, NFSDIR, &svfs);
+	ret = nfs_statvfs(nfs, NFSDIR, &svfs);
 	if (ret < 0) {
 		printf("Failed to statvfs(%s) %s\n", NFSDIR, nfs_get_error(nfs));
 		exit(10);
@@ -182,7 +182,7 @@ int main(int argc _U_, char *argv[] _U_)
 	printf("files %d/%d/%d\n", (int)svfs.f_files, (int)svfs.f_ffree, (int)svfs.f_favail);
 
 
-	ret = nfs_access_sync(nfs, NFSFILE, R_OK);
+	ret = nfs_access(nfs, NFSFILE, R_OK);
 	if (ret != 0) {
 		printf("Failed to access(%s) %s\n", NFSFILE, nfs_get_error(nfs));
 	}
@@ -190,7 +190,7 @@ int main(int argc _U_, char *argv[] _U_)
 	/* become root */
 	nfs_set_auth(nfs, authunix_create("Ronnies-Laptop", 0, 0, 0, NULL));
 
-	ret = nfs_link_sync(nfs, NFSFILE, NFSFILER);
+	ret = nfs_link(nfs, NFSFILE, NFSFILER);
 	if (ret != 0) {
 		printf("Failed to link(%s) %s\n", NFSFILE, nfs_get_error(nfs));
 	}
diff --git a/include/libnfs.h b/include/libnfs.h
index 93f8c3c..e95cdbe 100644
--- a/include/libnfs.h
+++ b/include/libnfs.h
@@ -100,7 +100,7 @@ int nfs_mount_async(struct nfs_context *nfs, const char *server, const char *exp
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_mount_sync(struct nfs_context *nfs, const char *server, const char *exportname);
+int nfs_mount(struct nfs_context *nfs, const char *server, const char *exportname);
 
 
 
@@ -128,7 +128,7 @@ int nfs_stat_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void *p
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_stat_sync(struct nfs_context *nfs, const char *path, struct stat *st);
+int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st);
 
 
 /*
@@ -153,7 +153,7 @@ int nfs_fstat_async(struct nfs_context *nfs, struct nfsfh *nfsfh, nfs_cb cb, voi
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_fstat_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st);
+int nfs_fstat(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st);
 
 
 
@@ -183,7 +183,7 @@ int nfs_open_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb c
  *      0 : The operation was successfull. *nfsfh is filled in.
  * -errno : The command failed.
  */
-int nfs_open_sync(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh);
+int nfs_open(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh);
 
 
 
@@ -211,7 +211,7 @@ int nfs_close_async(struct nfs_context *nfs, struct nfsfh *nfsfh, nfs_cb cb, voi
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_close_sync(struct nfs_context *nfs, struct nfsfh *nfsfh);
+int nfs_close(struct nfs_context *nfs, struct nfsfh *nfsfh);
 
 
 /*
@@ -238,7 +238,7 @@ int nfs_pread_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset,
  *    >=0 : numer of bytes read.
  * -errno : An error occured.
  */
-int nfs_pread_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf);
+int nfs_pread(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf);
 
 
 
@@ -266,7 +266,7 @@ int nfs_read_async(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, n
  *    >=0 : numer of bytes read.
  * -errno : An error occured.
  */
-int nfs_read_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf);
+int nfs_read(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf);
 
 
 
@@ -294,7 +294,7 @@ int nfs_pwrite_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset,
  *    >=0 : numer of bytes written.
  * -errno : An error occured.
  */
-int nfs_pwrite_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf);
+int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf);
 
 
 /*
@@ -320,7 +320,7 @@ int nfs_write_async(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count,
  *    >=0 : numer of bytes written.
  * -errno : An error occured.
  */
-int nfs_write_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf);
+int nfs_write(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf);
 
 
 /*
@@ -346,7 +346,7 @@ int nfs_lseek_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset,
  *    >=0 : numer of bytes read.
  * -errno : An error occured.
  */
-int nfs_lseek_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int whence, off_t *current_offset);
+int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int whence, off_t *current_offset);
 
 
 /*
@@ -371,7 +371,7 @@ int nfs_fsync_async(struct nfs_context *nfs, struct nfsfh *nfsfh, nfs_cb cb, voi
  *      0 : Success
  * -errno : An error occured.
  */
-int nfs_fsync_sync(struct nfs_context *nfs, struct nfsfh *nfsfh);
+int nfs_fsync(struct nfs_context *nfs, struct nfsfh *nfsfh);
 
 
 
@@ -397,7 +397,7 @@ int nfs_truncate_async(struct nfs_context *nfs, const char *path, off_t length,
  *      0 : Success
  * -errno : An error occured.
  */
-int nfs_truncate_sync(struct nfs_context *nfs, const char *path, off_t length);
+int nfs_truncate(struct nfs_context *nfs, const char *path, off_t length);
 
 
 
@@ -423,7 +423,7 @@ int nfs_ftruncate_async(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t leng
  *      0 : Success
  * -errno : An error occured.
  */
-int nfs_ftruncate_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length);
+int nfs_ftruncate(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length);
 
 
 
@@ -452,7 +452,7 @@ int nfs_mkdir_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void *
  *      0 : Success
  * -errno : An error occured.
  */
-int nfs_mkdir_sync(struct nfs_context *nfs, const char *path);
+int nfs_mkdir(struct nfs_context *nfs, const char *path);
 
 
 
@@ -478,7 +478,7 @@ int nfs_rmdir_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void *
  *      0 : Success
  * -errno : An error occured.
  */
-int nfs_rmdir_sync(struct nfs_context *nfs, const char *path);
+int nfs_rmdir(struct nfs_context *nfs, const char *path);
 
 
 
@@ -506,7 +506,7 @@ int nfs_creat_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb
  *      0 : Success
  * -errno : An error occured.
  */
-int nfs_creat_sync(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh);
+int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh);
 
 
 
@@ -535,7 +535,7 @@ int nfs_unlink_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void
  *      0 : Success
  * -errno : An error occured.
  */
-int nfs_unlink_sync(struct nfs_context *nfs, const char *path);
+int nfs_unlink(struct nfs_context *nfs, const char *path);
 
 
 
@@ -566,7 +566,7 @@ int nfs_opendir_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void
  *      0 : Success
  * -errno : An error occured.
  */
-int nfs_opendir_sync(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdir);
+int nfs_opendir(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdir);
 
 
 
@@ -618,7 +618,7 @@ int nfs_statvfs_async(struct nfs_context *nfs, const char *path, nfs_cb cb, void
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_statvfs_sync(struct nfs_context *nfs, const char *path, struct statvfs *svfs);
+int nfs_statvfs(struct nfs_context *nfs, const char *path, struct statvfs *svfs);
 
 
 /*
@@ -645,7 +645,7 @@ int nfs_readlink_async(struct nfs_context *nfs, const char *path, nfs_cb cb, voi
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_readlink_sync(struct nfs_context *nfs, const char *path, char *buf, int bufsize);
+int nfs_readlink(struct nfs_context *nfs, const char *path, char *buf, int bufsize);
 
 
 
@@ -671,7 +671,7 @@ int nfs_chmod_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_chmod_sync(struct nfs_context *nfs, const char *path, int mode);
+int nfs_chmod(struct nfs_context *nfs, const char *path, int mode);
 
 
 
@@ -697,7 +697,7 @@ int nfs_fchmod_async(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode, nfs
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_fchmod_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode);
+int nfs_fchmod(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode);
 
 
 
@@ -723,7 +723,7 @@ int nfs_chown_async(struct nfs_context *nfs, const char *path, int uid, int gid,
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_chown_sync(struct nfs_context *nfs, const char *path, int uid, int gid);
+int nfs_chown(struct nfs_context *nfs, const char *path, int uid, int gid);
 
 
 
@@ -749,7 +749,7 @@ int nfs_fchown_async(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_fchown_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid);
+int nfs_fchown(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid);
 
 
 
@@ -776,7 +776,7 @@ int nfs_utimes_async(struct nfs_context *nfs, const char *path, struct timeval *
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_utimes_sync(struct nfs_context *nfs, const char *path, struct timeval *times);
+int nfs_utimes(struct nfs_context *nfs, const char *path, struct timeval *times);
 
 
 /*
@@ -802,7 +802,7 @@ int nfs_utime_async(struct nfs_context *nfs, const char *path, struct utimbuf *t
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_utime_sync(struct nfs_context *nfs, const char *path, struct utimbuf *times);
+int nfs_utime(struct nfs_context *nfs, const char *path, struct utimbuf *times);
 
 
 
@@ -829,7 +829,7 @@ int nfs_access_async(struct nfs_context *nfs, const char *path, int mode, nfs_cb
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_access_sync(struct nfs_context *nfs, const char *path, int mode);
+int nfs_access(struct nfs_context *nfs, const char *path, int mode);
 
 
 
@@ -856,7 +856,7 @@ int nfs_symlink_async(struct nfs_context *nfs, const char *oldpath, const char *
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_symlink_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath);
+int nfs_symlink(struct nfs_context *nfs, const char *oldpath, const char *newpath);
 
 
 /*
@@ -881,7 +881,7 @@ int nfs_rename_async(struct nfs_context *nfs, const char *oldpath, const char *n
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_rename_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath);
+int nfs_rename(struct nfs_context *nfs, const char *oldpath, const char *newpath);
 
 
 
@@ -907,7 +907,7 @@ int nfs_link_async(struct nfs_context *nfs, const char *oldpath, const char *new
  *      0 : The operation was successfull.
  * -errno : The command failed.
  */
-int nfs_link_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath);
+int nfs_link(struct nfs_context *nfs, const char *oldpath, const char *newpath);
 
 
 
diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index 0dc6253..d873979 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -88,7 +88,7 @@ static void mount_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	}
 }
 
-int nfs_mount_sync(struct nfs_context *nfs, const char *server, const char *export)
+int nfs_mount(struct nfs_context *nfs, const char *server, const char *export)
 {
 	struct sync_cb_data cb_data;
 
@@ -123,7 +123,7 @@ static void stat_cb(int status, struct nfs_context *nfs _U_, void *data, void *p
 	memcpy(cb_data->return_data, data, sizeof(struct stat));
 }
 
-int nfs_stat_sync(struct nfs_context *nfs, const char *path, struct stat *st)
+int nfs_stat(struct nfs_context *nfs, const char *path, struct stat *st)
 {
 	struct sync_cb_data cb_data;
 
@@ -164,7 +164,7 @@ static void open_cb(int status, struct nfs_context *nfs _U_, void *data, void *p
 	*nfsfh = fh;
 }
 
-int nfs_open_sync(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh)
+int nfs_open(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh)
 {
 	struct sync_cb_data cb_data;
 
@@ -203,7 +203,7 @@ static void pread_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	memcpy(buffer, (char *)data, status);
 }
 
-int nfs_pread_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buffer)
+int nfs_pread(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buffer)
 {
 	struct sync_cb_data cb_data;
 
@@ -223,9 +223,9 @@ int nfs_pread_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, s
 /*
  * read()
  */
-int nfs_read_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buffer)
+int nfs_read(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buffer)
 {
-	return nfs_pread_sync(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buffer);
+	return nfs_pread(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buffer);
 }
 
 /*
@@ -243,7 +243,7 @@ static void close_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	}
 }
 
-int nfs_close_sync(struct nfs_context *nfs, struct nfsfh *nfsfh)
+int nfs_close(struct nfs_context *nfs, struct nfsfh *nfsfh)
 {
 	struct sync_cb_data cb_data;
 
@@ -265,7 +265,7 @@ int nfs_close_sync(struct nfs_context *nfs, struct nfsfh *nfsfh)
 /*
  * fstat()
  */
-int nfs_fstat_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st)
+int nfs_fstat(struct nfs_context *nfs, struct nfsfh *nfsfh, struct stat *st)
 {
 	struct sync_cb_data cb_data;
 
@@ -298,7 +298,7 @@ static void pwrite_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	}
 }
 
-int nfs_pwrite_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf)
+int nfs_pwrite(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, size_t count, char *buf)
 {
 	struct sync_cb_data cb_data;
 
@@ -317,9 +317,9 @@ int nfs_pwrite_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset,
 /*
  * write()
  */
-int nfs_write_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf)
+int nfs_write(struct nfs_context *nfs, struct nfsfh *nfsfh, size_t count, char *buf)
 {
-	return nfs_pwrite_sync(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buf);
+	return nfs_pwrite(nfs, nfsfh, nfs_get_current_offset(nfsfh), count, buf);
 }
 
 
@@ -338,7 +338,7 @@ static void fsync_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	}
 }
 
-int nfs_fsync_sync(struct nfs_context *nfs, struct nfsfh *nfsfh)
+int nfs_fsync(struct nfs_context *nfs, struct nfsfh *nfsfh)
 {
 	struct sync_cb_data cb_data;
 
@@ -372,7 +372,7 @@ static void ftruncate_cb(int status, struct nfs_context *nfs _U_, void *data, vo
 	}
 }
 
-int nfs_ftruncate_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length)
+int nfs_ftruncate(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t length)
 {
 	struct sync_cb_data cb_data;
 
@@ -405,7 +405,7 @@ static void truncate_cb(int status, struct nfs_context *nfs _U_, void *data, voi
 	}
 }
 
-int nfs_truncate_sync(struct nfs_context *nfs, const char *path, off_t length)
+int nfs_truncate(struct nfs_context *nfs, const char *path, off_t length)
 {
 	struct sync_cb_data cb_data;
 
@@ -440,7 +440,7 @@ static void mkdir_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	}
 }
 
-int nfs_mkdir_sync(struct nfs_context *nfs, const char *path)
+int nfs_mkdir(struct nfs_context *nfs, const char *path)
 {
 	struct sync_cb_data cb_data;
 
@@ -475,7 +475,7 @@ static void rmdir_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	}
 }
 
-int nfs_rmdir_sync(struct nfs_context *nfs, const char *path)
+int nfs_rmdir(struct nfs_context *nfs, const char *path)
 {
 	struct sync_cb_data cb_data;
 
@@ -514,7 +514,7 @@ static void creat_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	*nfsfh = fh;
 }
 
-int nfs_creat_sync(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh)
+int nfs_creat(struct nfs_context *nfs, const char *path, int mode, struct nfsfh **nfsfh)
 {
 	struct sync_cb_data cb_data;
 
@@ -550,7 +550,7 @@ static void unlink_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	}
 }
 
-int nfs_unlink_sync(struct nfs_context *nfs, const char *path)
+int nfs_unlink(struct nfs_context *nfs, const char *path)
 {
 	struct sync_cb_data cb_data;
 
@@ -589,7 +589,7 @@ static void opendir_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	*nfsdir = dir;
 }
 
-int nfs_opendir_sync(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdir)
+int nfs_opendir(struct nfs_context *nfs, const char *path, struct nfsdir **nfsdir)
 {
 	struct sync_cb_data cb_data;
 
@@ -627,7 +627,7 @@ static void lseek_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	}
 }
 
-int nfs_lseek_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int whence, off_t *current_offset)
+int nfs_lseek(struct nfs_context *nfs, struct nfsfh *nfsfh, off_t offset, int whence, off_t *current_offset)
 {
 	struct sync_cb_data cb_data;
 
@@ -664,7 +664,7 @@ static void statvfs_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	memcpy(cb_data->return_data, data, sizeof(struct statvfs));
 }
 
-int nfs_statvfs_sync(struct nfs_context *nfs, const char *path, struct statvfs *svfs)
+int nfs_statvfs(struct nfs_context *nfs, const char *path, struct statvfs *svfs)
 {
 	struct sync_cb_data cb_data;
 
@@ -709,7 +709,7 @@ static void readlink_cb(int status, struct nfs_context *nfs _U_, void *data, voi
 	memcpy(cb_data->return_data, data, strlen(data)+1);
 }
 
-int nfs_readlink_sync(struct nfs_context *nfs, const char *path, char *buf, int bufsize)
+int nfs_readlink(struct nfs_context *nfs, const char *path, char *buf, int bufsize)
 {
 	struct sync_cb_data cb_data;
 
@@ -745,7 +745,7 @@ static void chmod_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	}
 }
 
-int nfs_chmod_sync(struct nfs_context *nfs, const char *path, int mode)
+int nfs_chmod(struct nfs_context *nfs, const char *path, int mode)
 {
 	struct sync_cb_data cb_data;
 
@@ -780,7 +780,7 @@ static void fchmod_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	}
 }
 
-int nfs_fchmod_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode)
+int nfs_fchmod(struct nfs_context *nfs, struct nfsfh *nfsfh, int mode)
 {
 	struct sync_cb_data cb_data;
 
@@ -815,7 +815,7 @@ static void chown_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	}
 }
 
-int nfs_chown_sync(struct nfs_context *nfs, const char *path, int uid, int gid)
+int nfs_chown(struct nfs_context *nfs, const char *path, int uid, int gid)
 {
 	struct sync_cb_data cb_data;
 
@@ -847,7 +847,7 @@ static void fchown_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	}
 }
 
-int nfs_fchown_sync(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid)
+int nfs_fchown(struct nfs_context *nfs, struct nfsfh *nfsfh, int uid, int gid)
 {
 	struct sync_cb_data cb_data;
 
@@ -881,7 +881,7 @@ static void utimes_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	}
 }
 
-int nfs_utimes_sync(struct nfs_context *nfs, const char *path, struct timeval *times)
+int nfs_utimes(struct nfs_context *nfs, const char *path, struct timeval *times)
 {
 	struct sync_cb_data cb_data;
 
@@ -915,7 +915,7 @@ static void utime_cb(int status, struct nfs_context *nfs _U_, void *data, void *
 	}
 }
 
-int nfs_utime_sync(struct nfs_context *nfs, const char *path, struct utimbuf *times)
+int nfs_utime(struct nfs_context *nfs, const char *path, struct utimbuf *times)
 {
 	struct sync_cb_data cb_data;
 
@@ -950,7 +950,7 @@ static void access_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	}
 }
 
-int nfs_access_sync(struct nfs_context *nfs, const char *path, int mode)
+int nfs_access(struct nfs_context *nfs, const char *path, int mode)
 {
 	struct sync_cb_data cb_data;
 
@@ -984,7 +984,7 @@ static void symlink_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	}
 }
 
-int nfs_symlink_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath)
+int nfs_symlink(struct nfs_context *nfs, const char *oldpath, const char *newpath)
 {
 	struct sync_cb_data cb_data;
 
@@ -1018,7 +1018,7 @@ static void rename_cb(int status, struct nfs_context *nfs _U_, void *data, void
 	}
 }
 
-int nfs_rename_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath)
+int nfs_rename(struct nfs_context *nfs, const char *oldpath, const char *newpath)
 {
 	struct sync_cb_data cb_data;
 
@@ -1052,7 +1052,7 @@ static void link_cb(int status, struct nfs_context *nfs _U_, void *data, void *p
 	}
 }
 
-int nfs_link_sync(struct nfs_context *nfs, const char *oldpath, const char *newpath)
+int nfs_link(struct nfs_context *nfs, const char *oldpath, const char *newpath)
 {
 	struct sync_cb_data cb_data;