Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / fs / nfsd / nfs3proc.c

diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c
index 4a2bae07cfbff64e4038dbb5906d81d2bcc3cedb..2cb56a0d6625f07db79447768fac92c86940d9b7 100644 (file)
--- a/fs/nfsd/nfs3proc.c
+++ b/fs/nfsd/nfs3proc.c
@@ -674,10 +674,10 @@ struct nfsd3_voidargs { int dummy; };
 #define pAT (1+AT)     /* post attributes - conditional */
 #define WC (7+pAT)     /* WCC attributes */
 
-static struct svc_procedure            nfsd_procedures3[22] = {
+static const struct svc_procedure nfsd_procedures3[22] = {
        [NFS3PROC_NULL] = {
                .pc_func = nfsd3_proc_null,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_voidres,
+               .pc_encode = nfs3svc_encode_voidres,
                .pc_argsize = sizeof(struct nfsd3_voidargs),
                .pc_ressize = sizeof(struct nfsd3_voidres),
                .pc_cachetype = RC_NOCACHE,
@@ -685,9 +685,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_GETATTR] = {
                .pc_func = nfsd3_proc_getattr,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_fhandleargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_attrstatres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_fhandleargs,
+               .pc_encode = nfs3svc_encode_attrstatres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_fhandleargs),
                .pc_ressize = sizeof(struct nfsd3_attrstatres),
                .pc_cachetype = RC_NOCACHE,
@@ -695,9 +695,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_SETATTR] = {
                .pc_func = nfsd3_proc_setattr,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_sattrargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_wccstatres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_sattrargs,
+               .pc_encode = nfs3svc_encode_wccstatres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_sattrargs),
                .pc_ressize = sizeof(struct nfsd3_wccstatres),
                .pc_cachetype = RC_REPLBUFF,
@@ -705,9 +705,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_LOOKUP] = {
                .pc_func = nfsd3_proc_lookup,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_diropargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_diropres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle2,
+               .pc_decode = nfs3svc_decode_diropargs,
+               .pc_encode = nfs3svc_encode_diropres,
+               .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_diropargs),
                .pc_ressize = sizeof(struct nfsd3_diropres),
                .pc_cachetype = RC_NOCACHE,
@@ -715,9 +715,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_ACCESS] = {
                .pc_func = nfsd3_proc_access,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_accessargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_accessres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_accessargs,
+               .pc_encode = nfs3svc_encode_accessres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_accessargs),
                .pc_ressize = sizeof(struct nfsd3_accessres),
                .pc_cachetype = RC_NOCACHE,
@@ -725,9 +725,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_READLINK] = {
                .pc_func = nfsd3_proc_readlink,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_readlinkargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_readlinkres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_readlinkargs,
+               .pc_encode = nfs3svc_encode_readlinkres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_readlinkargs),
                .pc_ressize = sizeof(struct nfsd3_readlinkres),
                .pc_cachetype = RC_NOCACHE,
@@ -735,9 +735,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_READ] = {
                .pc_func = nfsd3_proc_read,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_readargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_readres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_readargs,
+               .pc_encode = nfs3svc_encode_readres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_readargs),
                .pc_ressize = sizeof(struct nfsd3_readres),
                .pc_cachetype = RC_NOCACHE,
@@ -745,9 +745,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_WRITE] = {
                .pc_func = nfsd3_proc_write,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_writeargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_writeres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_writeargs,
+               .pc_encode = nfs3svc_encode_writeres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_writeargs),
                .pc_ressize = sizeof(struct nfsd3_writeres),
                .pc_cachetype = RC_REPLBUFF,
@@ -755,9 +755,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_CREATE] = {
                .pc_func = nfsd3_proc_create,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_createargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_createres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle2,
+               .pc_decode = nfs3svc_decode_createargs,
+               .pc_encode = nfs3svc_encode_createres,
+               .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_createargs),
                .pc_ressize = sizeof(struct nfsd3_createres),
                .pc_cachetype = RC_REPLBUFF,
@@ -765,9 +765,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_MKDIR] = {
                .pc_func = nfsd3_proc_mkdir,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_mkdirargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_createres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle2,
+               .pc_decode = nfs3svc_decode_mkdirargs,
+               .pc_encode = nfs3svc_encode_createres,
+               .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_mkdirargs),
                .pc_ressize = sizeof(struct nfsd3_createres),
                .pc_cachetype = RC_REPLBUFF,
@@ -775,9 +775,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_SYMLINK] = {
                .pc_func = nfsd3_proc_symlink,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_symlinkargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_createres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle2,
+               .pc_decode = nfs3svc_decode_symlinkargs,
+               .pc_encode = nfs3svc_encode_createres,
+               .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_symlinkargs),
                .pc_ressize = sizeof(struct nfsd3_createres),
                .pc_cachetype = RC_REPLBUFF,
@@ -785,9 +785,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_MKNOD] = {
                .pc_func = nfsd3_proc_mknod,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_mknodargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_createres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle2,
+               .pc_decode = nfs3svc_decode_mknodargs,
+               .pc_encode = nfs3svc_encode_createres,
+               .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_mknodargs),
                .pc_ressize = sizeof(struct nfsd3_createres),
                .pc_cachetype = RC_REPLBUFF,
@@ -795,9 +795,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_REMOVE] = {
                .pc_func = nfsd3_proc_remove,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_diropargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_wccstatres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_diropargs,
+               .pc_encode = nfs3svc_encode_wccstatres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_diropargs),
                .pc_ressize = sizeof(struct nfsd3_wccstatres),
                .pc_cachetype = RC_REPLBUFF,
@@ -805,9 +805,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_RMDIR] = {
                .pc_func = nfsd3_proc_rmdir,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_diropargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_wccstatres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_diropargs,
+               .pc_encode = nfs3svc_encode_wccstatres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_diropargs),
                .pc_ressize = sizeof(struct nfsd3_wccstatres),
                .pc_cachetype = RC_REPLBUFF,
@@ -815,9 +815,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_RENAME] = {
                .pc_func = nfsd3_proc_rename,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_renameargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_renameres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle2,
+               .pc_decode = nfs3svc_decode_renameargs,
+               .pc_encode = nfs3svc_encode_renameres,
+               .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_renameargs),
                .pc_ressize = sizeof(struct nfsd3_renameres),
                .pc_cachetype = RC_REPLBUFF,
@@ -825,9 +825,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_LINK] = {
                .pc_func = nfsd3_proc_link,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_linkargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_linkres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle2,
+               .pc_decode = nfs3svc_decode_linkargs,
+               .pc_encode = nfs3svc_encode_linkres,
+               .pc_release = nfs3svc_release_fhandle2,
                .pc_argsize = sizeof(struct nfsd3_linkargs),
                .pc_ressize = sizeof(struct nfsd3_linkres),
                .pc_cachetype = RC_REPLBUFF,
@@ -835,26 +835,26 @@ static struct svc_procedure               nfsd_procedures3[22] = {
        },
        [NFS3PROC_READDIR] = {
                .pc_func = nfsd3_proc_readdir,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_readdirargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_readdirres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_readdirargs,
+               .pc_encode = nfs3svc_encode_readdirres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_readdirargs),
                .pc_ressize = sizeof(struct nfsd3_readdirres),
                .pc_cachetype = RC_NOCACHE,
        },
        [NFS3PROC_READDIRPLUS] = {
                .pc_func = nfsd3_proc_readdirplus,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_readdirplusargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_readdirres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_readdirplusargs,
+               .pc_encode = nfs3svc_encode_readdirres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_readdirplusargs),
                .pc_ressize = sizeof(struct nfsd3_readdirres),
                .pc_cachetype = RC_NOCACHE,
        },
        [NFS3PROC_FSSTAT] = {
                .pc_func = nfsd3_proc_fsstat,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_fhandleargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_fsstatres,
+               .pc_decode = nfs3svc_decode_fhandleargs,
+               .pc_encode = nfs3svc_encode_fsstatres,
                .pc_argsize = sizeof(struct nfsd3_fhandleargs),
                .pc_ressize = sizeof(struct nfsd3_fsstatres),
                .pc_cachetype = RC_NOCACHE,
@@ -862,8 +862,8 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_FSINFO] = {
                .pc_func = nfsd3_proc_fsinfo,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_fhandleargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_fsinfores,
+               .pc_decode = nfs3svc_decode_fhandleargs,
+               .pc_encode = nfs3svc_encode_fsinfores,
                .pc_argsize = sizeof(struct nfsd3_fhandleargs),
                .pc_ressize = sizeof(struct nfsd3_fsinfores),
                .pc_cachetype = RC_NOCACHE,
@@ -871,8 +871,8 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_PATHCONF] = {
                .pc_func = nfsd3_proc_pathconf,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_fhandleargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_pathconfres,
+               .pc_decode = nfs3svc_decode_fhandleargs,
+               .pc_encode = nfs3svc_encode_pathconfres,
                .pc_argsize = sizeof(struct nfsd3_fhandleargs),
                .pc_ressize = sizeof(struct nfsd3_pathconfres),
                .pc_cachetype = RC_NOCACHE,
@@ -880,9 +880,9 @@ static struct svc_procedure         nfsd_procedures3[22] = {
        },
        [NFS3PROC_COMMIT] = {
                .pc_func = nfsd3_proc_commit,
-               .pc_decode = (kxdrproc_t) nfs3svc_decode_commitargs,
-               .pc_encode = (kxdrproc_t) nfs3svc_encode_commitres,
-               .pc_release = (kxdrproc_t) nfs3svc_release_fhandle,
+               .pc_decode = nfs3svc_decode_commitargs,
+               .pc_encode = nfs3svc_encode_commitres,
+               .pc_release = nfs3svc_release_fhandle,
                .pc_argsize = sizeof(struct nfsd3_commitargs),
                .pc_ressize = sizeof(struct nfsd3_commitres),
                .pc_cachetype = RC_NOCACHE,
@@ -890,10 +890,12 @@ static struct svc_procedure               nfsd_procedures3[22] = {
        },
 };
 
-struct svc_version     nfsd_version3 = {
-               .vs_vers        = 3,
-               .vs_nproc       = 22,
-               .vs_proc        = nfsd_procedures3,
-               .vs_dispatch    = nfsd_dispatch,
-               .vs_xdrsize     = NFS3_SVC_XDRSIZE,
+static unsigned int nfsd_count3[ARRAY_SIZE(nfsd_procedures3)];
+const struct svc_version nfsd_version3 = {
+       .vs_vers        = 3,
+       .vs_nproc       = 22,
+       .vs_proc        = nfsd_procedures3,
+       .vs_dispatch    = nfsd_dispatch,
+       .vs_count       = nfsd_count3,
+       .vs_xdrsize     = NFS3_SVC_XDRSIZE,
 };