Merge branch 'work.d_name' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / fs / lockd / svcproc.c

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 50855f2..4ae4b63 100644 (file)
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -554,6 +554,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_void),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "NULL",
        },
        [NLMPROC_TEST] = {
                .pc_func = nlmsvc_proc_test,
@@ -562,6 +563,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_res),
                .pc_xdrressize = Ck+St+2+No+Rg,
+               .pc_name = "TEST",
        },
        [NLMPROC_LOCK] = {
                .pc_func = nlmsvc_proc_lock,
@@ -570,6 +572,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_res),
                .pc_xdrressize = Ck+St,
+               .pc_name = "LOCK",
        },
        [NLMPROC_CANCEL] = {
                .pc_func = nlmsvc_proc_cancel,
@@ -578,6 +581,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_res),
                .pc_xdrressize = Ck+St,
+               .pc_name = "CANCEL",
        },
        [NLMPROC_UNLOCK] = {
                .pc_func = nlmsvc_proc_unlock,
@@ -586,6 +590,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_res),
                .pc_xdrressize = Ck+St,
+               .pc_name = "UNLOCK",
        },
        [NLMPROC_GRANTED] = {
                .pc_func = nlmsvc_proc_granted,
@@ -594,6 +599,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_res),
                .pc_xdrressize = Ck+St,
+               .pc_name = "GRANTED",
        },
        [NLMPROC_TEST_MSG] = {
                .pc_func = nlmsvc_proc_test_msg,
@@ -602,6 +608,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "TEST_MSG",
        },
        [NLMPROC_LOCK_MSG] = {
                .pc_func = nlmsvc_proc_lock_msg,
@@ -610,6 +617,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "LOCK_MSG",
        },
        [NLMPROC_CANCEL_MSG] = {
                .pc_func = nlmsvc_proc_cancel_msg,
@@ -618,6 +626,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "CANCEL_MSG",
        },
        [NLMPROC_UNLOCK_MSG] = {
                .pc_func = nlmsvc_proc_unlock_msg,
@@ -626,6 +635,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "UNLOCK_MSG",
        },
        [NLMPROC_GRANTED_MSG] = {
                .pc_func = nlmsvc_proc_granted_msg,
@@ -634,6 +644,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "GRANTED_MSG",
        },
        [NLMPROC_TEST_RES] = {
                .pc_func = nlmsvc_proc_null,
@@ -642,6 +653,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_res),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "TEST_RES",
        },
        [NLMPROC_LOCK_RES] = {
                .pc_func = nlmsvc_proc_null,
@@ -650,6 +662,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_res),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "LOCK_RES",
        },
        [NLMPROC_CANCEL_RES] = {
                .pc_func = nlmsvc_proc_null,
@@ -658,6 +671,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_res),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "CANCEL_RES",
        },
        [NLMPROC_UNLOCK_RES] = {
                .pc_func = nlmsvc_proc_null,
@@ -666,6 +680,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_res),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "UNLOCK_RES",
        },
        [NLMPROC_GRANTED_RES] = {
                .pc_func = nlmsvc_proc_granted_res,
@@ -674,6 +689,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_res),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "GRANTED_RES",
        },
        [NLMPROC_NSM_NOTIFY] = {
                .pc_func = nlmsvc_proc_sm_notify,
@@ -682,6 +698,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_reboot),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "SM_NOTIFY",
        },
        [17] = {
                .pc_func = nlmsvc_proc_unused,
@@ -690,6 +707,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_void),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "UNUSED",
        },
        [18] = {
                .pc_func = nlmsvc_proc_unused,
@@ -698,6 +716,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_void),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "UNUSED",
        },
        [19] = {
                .pc_func = nlmsvc_proc_unused,
@@ -706,6 +725,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_void),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = St,
+               .pc_name = "UNUSED",
        },
        [NLMPROC_SHARE] = {
                .pc_func = nlmsvc_proc_share,
@@ -714,6 +734,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_res),
                .pc_xdrressize = Ck+St+1,
+               .pc_name = "SHARE",
        },
        [NLMPROC_UNSHARE] = {
                .pc_func = nlmsvc_proc_unshare,
@@ -722,6 +743,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_res),
                .pc_xdrressize = Ck+St+1,
+               .pc_name = "UNSHARE",
        },
        [NLMPROC_NM_LOCK] = {
                .pc_func = nlmsvc_proc_nm_lock,
@@ -730,6 +752,7 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_res),
                .pc_xdrressize = Ck+St,
+               .pc_name = "NM_LOCK",
        },
        [NLMPROC_FREE_ALL] = {
                .pc_func = nlmsvc_proc_free_all,
@@ -738,5 +761,6 @@ const struct svc_procedure nlmsvc_procedures[24] = {
                .pc_argsize = sizeof(struct nlm_args),
                .pc_ressize = sizeof(struct nlm_void),
                .pc_xdrressize = 0,
+               .pc_name = "FREE_ALL",
        },
 };