summaryrefslogtreecommitdiffstats
path: root/sys/fs/nfsclient/nfs_clvnops.c
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2009-12-26 19:15:15 +0000
committerrmacklem <rmacklem@FreeBSD.org>2009-12-26 19:15:15 +0000
commit155f4290956678fa21093c63d274269600ef6966 (patch)
treea1c64e10bbeedd938decdbd83de6dddeef044a11 /sys/fs/nfsclient/nfs_clvnops.c
parentd7736702264afdd928eafec9e103477a234c3014 (diff)
downloadFreeBSD-src-155f4290956678fa21093c63d274269600ef6966.zip
FreeBSD-src-155f4290956678fa21093c63d274269600ef6966.tar.gz
When porting the experimental nfs subsystem to the FreeBSD8 krpc,
I added 3 functions that were already in the experimental client under different names. This patch deletes the functions in the experimental client and renames the calls to use the other set. (This is just removal of duplicated code and does not fix any bug.) MFC after: 2 weeks
Diffstat (limited to 'sys/fs/nfsclient/nfs_clvnops.c')
-rw-r--r--sys/fs/nfsclient/nfs_clvnops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c
index 5436c8b..251966d 100644
--- a/sys/fs/nfsclient/nfs_clvnops.c
+++ b/sys/fs/nfsclient/nfs_clvnops.c
@@ -2708,9 +2708,9 @@ loop:
mtx_lock(&np->n_mtx);
while (np->n_directio_asyncwr > 0) {
np->n_flag |= NFSYNCWAIT;
- error = ncl_msleep(td, (caddr_t)&np->n_directio_asyncwr,
- &np->n_mtx, slpflag | (PRIBIO + 1),
- "nfsfsync", 0);
+ error = newnfs_msleep(td, &np->n_directio_asyncwr,
+ &np->n_mtx, slpflag | (PRIBIO + 1),
+ "nfsfsync", 0);
if (error) {
if (newnfs_sigintr(nmp, td)) {
mtx_unlock(&np->n_mtx);
OpenPOWER on IntegriCloud