summaryrefslogtreecommitdiffstats
path: root/xlators/nfs
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/nfs')
-rw-r--r--xlators/nfs/server/src/mount3.c20
-rw-r--r--xlators/nfs/server/src/nfs3.c50
-rw-r--r--xlators/nfs/server/src/nlm4.c48
3 files changed, 56 insertions, 62 deletions
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index aafabf4ae2a..efd74aa58ac 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -1844,12 +1844,12 @@ out:
}
rpcsvc_actor_t mnt3svc_actors[MOUNT3_PROC_COUNT] = {
- {"NULL", MOUNT3_NULL, mnt3svc_null, NULL, NULL, 0},
- {"MNT", MOUNT3_MNT, mnt3svc_mnt, NULL, NULL, 0},
- {"DUMP", MOUNT3_DUMP, mnt3svc_dump, NULL, NULL, 0},
- {"UMNT", MOUNT3_UMNT, mnt3svc_umnt, NULL, NULL, 0},
- {"UMNTALL", MOUNT3_UMNTALL, mnt3svc_umntall, NULL, NULL, 0},
- {"EXPORT", MOUNT3_EXPORT, mnt3svc_export, NULL, NULL, 0}
+ {"NULL", MOUNT3_NULL, mnt3svc_null, NULL, 0},
+ {"MNT", MOUNT3_MNT, mnt3svc_mnt, NULL, 0},
+ {"DUMP", MOUNT3_DUMP, mnt3svc_dump, NULL, 0},
+ {"UMNT", MOUNT3_UMNT, mnt3svc_umnt, NULL, 0},
+ {"UMNTALL", MOUNT3_UMNTALL, mnt3svc_umntall, NULL, 0},
+ {"EXPORT", MOUNT3_EXPORT, mnt3svc_export, NULL, 0}
};
@@ -1937,12 +1937,12 @@ err:
rpcsvc_actor_t mnt1svc_actors[MOUNT1_PROC_COUNT] = {
- {"NULL", MOUNT1_NULL, mnt3svc_null, NULL, NULL, 0},
+ {"NULL", MOUNT1_NULL, mnt3svc_null, NULL, 0},
{{0, 0}, },
- {"DUMP", MOUNT1_DUMP, mnt3svc_dump, NULL, NULL, 0},
- {"UMNT", MOUNT1_UMNT, mnt3svc_umnt, NULL, NULL, 0},
+ {"DUMP", MOUNT1_DUMP, mnt3svc_dump, NULL, 0},
+ {"UMNT", MOUNT1_UMNT, mnt3svc_umnt, NULL, 0},
{{0, 0}, },
- {"EXPORT", MOUNT1_EXPORT, mnt3svc_export, NULL, NULL, 0}
+ {"EXPORT", MOUNT1_EXPORT, mnt3svc_export, NULL, 0}
};
rpcsvc_program_t mnt1prog = {
diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index 9b8af7df8d9..1c379997266 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -2298,12 +2298,6 @@ rpcerr:
return ret;
}
-int
-nfs3svc_write_vec (rpcsvc_request_t *req, struct iovec *payload,
- int payload_count, struct iobref *iobref)
-{
- return nfs3svc_write (req);
-}
int
nfs3_create_reply (rpcsvc_request_t *req, nfsstat3 stat, struct nfs3_fh *newfh,
@@ -5087,28 +5081,28 @@ rpcerr:
rpcsvc_actor_t nfs3svc_actors[NFS3_PROC_COUNT] = {
- {"NULL", NFS3_NULL, nfs3svc_null, NULL, NULL, 0},
- {"GETATTR", NFS3_GETATTR, nfs3svc_getattr,NULL, NULL, 0},
- {"SETATTR", NFS3_SETATTR, nfs3svc_setattr,NULL, NULL, 0},
- {"LOOKUP", NFS3_LOOKUP, nfs3svc_lookup, NULL, NULL, 0},
- {"ACCESS", NFS3_ACCESS, nfs3svc_access, NULL, NULL, 0},
- {"READLINK", NFS3_READLINK, nfs3svc_readlink,NULL, NULL, 0},
- {"READ", NFS3_READ, nfs3svc_read, NULL, NULL, 0},
- {"WRITE", NFS3_WRITE, nfs3svc_write, nfs3svc_write_vec, nfs3svc_write_vecsizer, 0},
- {"CREATE", NFS3_CREATE, nfs3svc_create, NULL, NULL, 0},
- {"MKDIR", NFS3_MKDIR, nfs3svc_mkdir, NULL, NULL, 0},
- {"SYMLINK", NFS3_SYMLINK, nfs3svc_symlink,NULL, NULL, 0},
- {"MKNOD", NFS3_MKNOD, nfs3svc_mknod, NULL, NULL, 0},
- {"REMOVE", NFS3_REMOVE, nfs3svc_remove, NULL, NULL, 0},
- {"RMDIR", NFS3_RMDIR, nfs3svc_rmdir, NULL, NULL, 0},
- {"RENAME", NFS3_RENAME, nfs3svc_rename, NULL, NULL, 0},
- {"LINK", NFS3_LINK, nfs3svc_link, NULL, NULL, 0},
- {"READDIR", NFS3_READDIR, nfs3svc_readdir,NULL, NULL, 0},
- {"READDIRPLUS", NFS3_READDIRP, nfs3svc_readdirp,NULL, NULL, 0},
- {"FSSTAT", NFS3_FSSTAT, nfs3svc_fsstat, NULL, NULL, 0},
- {"FSINFO", NFS3_FSINFO, nfs3svc_fsinfo, NULL, NULL, 0},
- {"PATHCONF", NFS3_PATHCONF, nfs3svc_pathconf,NULL, NULL, 0},
- {"COMMIT", NFS3_COMMIT, nfs3svc_commit, NULL, NULL, 0}
+ {"NULL", NFS3_NULL, nfs3svc_null, NULL, 0},
+ {"GETATTR", NFS3_GETATTR, nfs3svc_getattr,NULL, 0},
+ {"SETATTR", NFS3_SETATTR, nfs3svc_setattr,NULL, 0},
+ {"LOOKUP", NFS3_LOOKUP, nfs3svc_lookup, NULL, 0},
+ {"ACCESS", NFS3_ACCESS, nfs3svc_access, NULL, 0},
+ {"READLINK", NFS3_READLINK, nfs3svc_readlink,NULL, 0},
+ {"READ", NFS3_READ, nfs3svc_read, NULL, 0},
+ {"WRITE", NFS3_WRITE, nfs3svc_write, nfs3svc_write_vecsizer, 0},
+ {"CREATE", NFS3_CREATE, nfs3svc_create, NULL, 0},
+ {"MKDIR", NFS3_MKDIR, nfs3svc_mkdir, NULL, 0},
+ {"SYMLINK", NFS3_SYMLINK, nfs3svc_symlink,NULL, 0},
+ {"MKNOD", NFS3_MKNOD, nfs3svc_mknod, NULL, 0},
+ {"REMOVE", NFS3_REMOVE, nfs3svc_remove, NULL, 0},
+ {"RMDIR", NFS3_RMDIR, nfs3svc_rmdir, NULL, 0},
+ {"RENAME", NFS3_RENAME, nfs3svc_rename, NULL, 0},
+ {"LINK", NFS3_LINK, nfs3svc_link, NULL, 0},
+ {"READDIR", NFS3_READDIR, nfs3svc_readdir,NULL, 0},
+ {"READDIRPLUS", NFS3_READDIRP, nfs3svc_readdirp,NULL, 0},
+ {"FSSTAT", NFS3_FSSTAT, nfs3svc_fsstat, NULL, 0},
+ {"FSINFO", NFS3_FSINFO, nfs3svc_fsinfo, NULL, 0},
+ {"PATHCONF", NFS3_PATHCONF, nfs3svc_pathconf,NULL, 0},
+ {"COMMIT", NFS3_COMMIT, nfs3svc_commit, NULL, 0}
};
diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c
index 6399cb0436c..99541fd4bde 100644
--- a/xlators/nfs/server/src/nlm4.c
+++ b/xlators/nfs/server/src/nlm4.c
@@ -2257,34 +2257,34 @@ nlm4svc_sm_notify (struct nlm_sm_status *status)
rpcsvc_actor_t nlm4svc_actors[NLM4_PROC_COUNT] = {
/* 0 */
- {"NULL", NLM4_NULL, nlm4svc_null, NULL, NULL},
- {"TEST", NLM4_TEST, nlm4svc_test, NULL, NULL},
- {"LOCK", NLM4_LOCK, nlm4svc_lock, NULL, NULL},
- {"CANCEL", NLM4_CANCEL, nlm4svc_cancel, NULL, NULL},
- {"UNLOCK", NLM4_UNLOCK, nlm4svc_unlock, NULL, NULL},
+ {"NULL", NLM4_NULL, nlm4svc_null, NULL},
+ {"TEST", NLM4_TEST, nlm4svc_test, NULL},
+ {"LOCK", NLM4_LOCK, nlm4svc_lock, NULL},
+ {"CANCEL", NLM4_CANCEL, nlm4svc_cancel, NULL},
+ {"UNLOCK", NLM4_UNLOCK, nlm4svc_unlock, NULL},
/* 5 */
- {"GRANTED", NLM4_GRANTED, NULL, NULL, NULL},
- {"TEST", NLM4_TEST_MSG, NULL, NULL, NULL},
- {"LOCK", NLM4_LOCK_MSG, NULL, NULL, NULL},
- {"CANCEL", NLM4_CANCEL_MSG, NULL, NULL, NULL},
- {"UNLOCK", NLM4_UNLOCK_MSG, NULL, NULL, NULL},
+ {"GRANTED", NLM4_GRANTED, NULL, NULL},
+ {"TEST", NLM4_TEST_MSG, NULL, NULL},
+ {"LOCK", NLM4_LOCK_MSG, NULL, NULL},
+ {"CANCEL", NLM4_CANCEL_MSG, NULL, NULL},
+ {"UNLOCK", NLM4_UNLOCK_MSG, NULL, NULL},
/* 10 */
- {"GRANTED", NLM4_GRANTED_MSG, NULL, NULL, NULL},
- {"TEST", NLM4_TEST_RES, NULL, NULL, NULL},
- {"LOCK", NLM4_LOCK_RES, NULL, NULL, NULL},
- {"CANCEL", NLM4_CANCEL_RES, NULL, NULL, NULL},
- {"UNLOCK", NLM4_UNLOCK_RES, NULL, NULL, NULL},
+ {"GRANTED", NLM4_GRANTED_MSG, NULL, NULL},
+ {"TEST", NLM4_TEST_RES, NULL, NULL},
+ {"LOCK", NLM4_LOCK_RES, NULL, NULL},
+ {"CANCEL", NLM4_CANCEL_RES, NULL, NULL},
+ {"UNLOCK", NLM4_UNLOCK_RES, NULL, NULL},
/* 15 ; procedures 17,18,19 are not defined by nlm */
- {"GRANTED", NLM4_GRANTED_RES, NULL, NULL, NULL},
- {"SM_NOTIFY", NLM4_SM_NOTIFY, NULL, NULL, NULL},
- {"SEVENTEEN", NLM4_SEVENTEEN, NULL, NULL, NULL},
- {"EIGHTEEN", NLM4_EIGHTEEN, NULL, NULL, NULL},
- {"NINETEEN", NLM4_NINETEEN, NULL, NULL, NULL},
+ {"GRANTED", NLM4_GRANTED_RES, NULL, NULL},
+ {"SM_NOTIFY", NLM4_SM_NOTIFY, NULL, NULL},
+ {"SEVENTEEN", NLM4_SEVENTEEN, NULL, NULL},
+ {"EIGHTEEN", NLM4_EIGHTEEN, NULL, NULL},
+ {"NINETEEN", NLM4_NINETEEN, NULL, NULL},
/* 20 */
- {"SHARE", NLM4_SHARE, nlm4svc_share, NULL, NULL},
- {"UNSHARE", NLM4_UNSHARE, nlm4svc_unshare, NULL, NULL},
- {"NM_LOCK", NLM4_NM_LOCK, nlm4svc_nm_lock, NULL, NULL},
- {"FREE_ALL", NLM4_FREE_ALL, nlm4svc_free_all, NULL, NULL},
+ {"SHARE", NLM4_SHARE, nlm4svc_share, NULL},
+ {"UNSHARE", NLM4_UNSHARE, nlm4svc_unshare, NULL},
+ {"NM_LOCK", NLM4_NM_LOCK, nlm4svc_nm_lock, NULL},
+ {"FREE_ALL", NLM4_FREE_ALL, nlm4svc_free_all, NULL},
};
rpcsvc_program_t nlm4prog = {
generated by cgit (git 2.34.1) at 2025-11-04 05:31:50 +0000