KDFS-rename-residency-from-mrafs-to-osd-20090427

LICENSE IPL10
FIXES 124130

rename mrafs commands into their equivalent osd versions; structures etc are the
 same.

(cherry picked from commit 8655541d1eb6ea7d935f50d9256e12bf90db5045)

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 56304fc..f5251e1 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -88,7 +88,7 @@ DECL_PIOCTL(PFlushMount);
 DECL_PIOCTL(PRxStatProc);
 DECL_PIOCTL(PRxStatPeer);
 DECL_PIOCTL(PPrefetchFromTape);
-DECL_PIOCTL(PResidencyCmd);
+DECL_PIOCTL(PFsCmd);
 DECL_PIOCTL(PCallBackAddr);
 DECL_PIOCTL(PDiscon);
 DECL_PIOCTL(PNFSNukeCreds);
@@ -185,7 +185,7 @@ static int (*(VpioctlSw[])) () = {
        PBogus,                 /* 64 -- arla: force cache check */
        PBogus,                 /* 65 -- arla: break callback */
        PPrefetchFromTape,      /* 66 -- MR-AFS: prefetch file from tape */
-       PResidencyCmd,          /* 67 -- MR-AFS: generic commnd interface */
+       PFsCmd,                 /* 67 -- RXOSD: generic commnd interface */
        PBogus,                 /* 68 -- arla: fetch stats */
        PGetVnodeXStatus2,      /* 69 - get caller access and some vcache status */
 };
@@ -3808,8 +3808,8 @@ DECL_PIOCTL(PResidencyCmd)
            if (tc) {
                RX_AFS_GUNLOCK();
                code =
-                   RXAFS_ResidencyCmd(tc->id, Fid, Inputs,
-                                      (struct ResidencyCmdOutputs *)aout);
+                   RXAFS_FsCmd(tc->id, Fid, Inputs, 
+                                       (struct FsCmdOutputs *)aout);
                RX_AFS_GLOCK();
            } else
                code = -1;
@@ -3833,7 +3833,7 @@ DECL_PIOCTL(PResidencyCmd)
     afs_PutVCache(tvc);
 
     if (!code) {
-       *aoutSize = sizeof(struct ResidencyCmdOutputs);
+       *aoutSize = sizeof(struct FsCmdOutputs);
     }
     return code;
 }

diff --git a/src/config/vioc.h b/src/config/vioc.h
index a66ec06..b5e3863 100644 (file)
--- a/src/config/vioc.h
+++ b/src/config/vioc.h
@@ -87,8 +87,10 @@
 #define VIOC_RXSTAT_PEER       _VICEIOCTL(54)  /* Control peer RX stats */
 #define VIOC_GETRXKCRYPT        _VICEIOCTL(55) /* Set rxkad enc flag */
 #define VIOC_SETRXKCRYPT        _VICEIOCTL(56) /* Set rxkad enc flag */
-#define VIOC_PREFETCHTAPE       _VICEIOCTL(66) /* MR-AFS prefetch from tape */
-#define VIOC_RESIDENCY_CMD      _VICEIOCTL(67) /* generic MR-AFS cmds */
+#define VIOC_PREFETCHTAPE       _VICEIOCTL(66)  /* osd prefetch from tape */
+#define VIOC_FS_CMD             _VICEIOCTL(67)  /* fs extensions for osd etc. */
+#define VIOC_RESIDENCY_CMD      VIOC_FS_CMD
+
 #define VIOC_STATISTICS         _VICEIOCTL(68) /* arla: fetch statistics */
 #define VIOC_GETVCXSTATUS2      _VICEIOCTL(69)  /* vcache statistics */
 

diff --git a/src/fsint/afsint.xg b/src/fsint/afsint.xg
index f659163..18056fd 100644 (file)
--- a/src/fsint/afsint.xg
+++ b/src/fsint/afsint.xg
@@ -389,7 +389,7 @@ struct AccessHistoryOld {
     afs_uint32 Residency4;
 };
 
-struct ResidencyCmdInputs {
+struct FsCmdInputs {
     afs_int32  command;
     struct AFSFid fid;
     afs_int64  int64s[MAXCMDINT64S];
@@ -397,7 +397,7 @@ struct ResidencyCmdInputs {
     char       chars[MAXCMDCHARS];
 };
 
-struct ResidencyCmdOutputs {
+struct FsCmdOutputs {
     afs_int32  code;
     struct AFSFetchStatus status;
     afs_int64  int64s[MAXCMDINT64S];
@@ -405,6 +405,9 @@ struct ResidencyCmdOutputs {
     char       chars[MAXCMDCHARS];
 };
 
+%#define ResidencyCmdInputs FsCmdInputs
+%#define ResidencyCmdOutputs FsCmdOutputs
+
 const FLUSHMAX = 10;
 typedef afs_int32 ViceIds<FLUSHMAX>;
 typedef        afs_int32 IPAddrs<FLUSHMAX>;
@@ -656,12 +659,19 @@ DFSSymlink(
   AFSVolSync *Sync
 ) = 163;
 
-ResidencyCmd(
+FsCmd(
   IN AFSFid *Fid,
-  IN struct ResidencyCmdInputs *Inputs,
-  OUT struct ResidencyCmdOutputs *Outputs
+  IN struct FsCmdInputs *Inputs,
+  OUT struct FsCmdOutputs *Outputs
 ) = 220;
 
+#ifdef RPC_CLIENT
+%int RXAFS_ResidencyCmd(struct rx_connection *z_conn, AFSFid *Fid, struct FsCmdInputs *Inputs, struct FsCmdOutputs *Outputs)
+%{
+%  return RXAFS_FsCmd(z_conn, Fid, Inputs, Outputs);
+%}
+#endif
+
 InlineBulkStatus(
   IN  AFSCBFids *FidsArray,
   OUT AFSBulkStats *StatArray,

diff --git a/src/libafsrpc/afsrpc.def b/src/libafsrpc/afsrpc.def
index 54c31d1..f0e7d4e 100644 (file)
--- a/src/libafsrpc/afsrpc.def
+++ b/src/libafsrpc/afsrpc.def
@@ -245,6 +245,7 @@ EXPORTS
         rx_ReadProc32                           @250
         rx_WriteProc32                          @251
         xdr_free                                @252
+        RXAFS_FsCmd                             @253
 
 ; for performance testing
         rx_TSFPQGlobSize                        @2001 DATA

diff --git a/src/libafsrpc/afsrpc.exp b/src/libafsrpc/afsrpc.exp
index 06f1af9..97e3bb5 100644 (file)
--- a/src/libafsrpc/afsrpc.exp
+++ b/src/libafsrpc/afsrpc.exp
@@ -165,3 +165,4 @@ RXAFS_Lookup
 RXAFS_FlushCPS
 RXAFS_DFSSymlink
 RXAFSCB_function_names
+RXAFS_FsCmd

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 09385c5..406d902 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -1931,11 +1931,21 @@ SRXAFS_DFSSymlink(struct rx_call *acall, struct AFSFid *DirFid, char *Name,
 }
 
 afs_int32
-SRXAFS_ResidencyCmd(struct rx_call * acall, struct AFSFid * Fid,
-                   struct ResidencyCmdInputs * Inputs,
-                   struct ResidencyCmdOutputs * Outputs)
+SRXAFS_FsCmd(struct rx_call * acall, struct AFSFid * Fid,
+                   struct FsCmdInputs * Inputs,
+                   struct FsCmdOutputs * Outputs)
 {
-    return EINVAL;
+    afs_int32 code = 0;
+    struct AFSCallBack callback;
+    struct AFSVolSync sync;
+
+    switch (Inputs->command) {
+    default:
+        code = EINVAL;
+    }
+    ViceLog(1,("FsCmd: cmd = %d, code=%d\n", 
+                       Inputs->command, Outputs->code));
+    return code;
 }
 
 #ifdef AFS_NT40_ENV