]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - fs/afs/fsclient.c
[AFS]: Fix use of __exit functions from __init path
[mv-sheeva.git] / fs / afs / fsclient.c
index f1c3a186842eaea60491193427903746783028a9..e54e6c2ad343a25aba23997806a21b06dbca369a 100644 (file)
@@ -1,6 +1,6 @@
-/* fsclient.c: AFS File Server client stubs
+/* AFS File Server client stubs
  *
- * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2002, 2007 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
  *
  * This program is free software; you can redistribute it and/or
 
 #include <linux/init.h>
 #include <linux/sched.h>
-#include <rxrpc/rxrpc.h>
-#include <rxrpc/transport.h>
-#include <rxrpc/connection.h>
-#include <rxrpc/call.h>
-#include "fsclient.h"
-#include "cmservice.h"
-#include "vnode.h"
-#include "server.h"
-#include "errors.h"
+#include <linux/circ_buf.h>
 #include "internal.h"
-
-#define FSFETCHSTATUS          132     /* AFS Fetch file status */
-#define FSFETCHDATA            130     /* AFS Fetch file data */
-#define FSGIVEUPCALLBACKS      147     /* AFS Discard callback promises */
-#define FSGETVOLUMEINFO                148     /* AFS Get root volume information */
-#define FSGETROOTVOLUME                151     /* AFS Get root volume name */
-#define FSLOOKUP               161     /* AFS lookup file in directory */
+#include "afs_fs.h"
 
 /*
- * map afs abort codes to/from Linux error codes
- * - called with call->lock held
+ * decode an AFSFid block
  */
-static void afs_rxfs_aemap(struct rxrpc_call *call)
+static void xdr_decode_AFSFid(const __be32 **_bp, struct afs_fid *fid)
 {
-       switch (call->app_err_state) {
-       case RXRPC_ESTATE_LOCAL_ABORT:
-               call->app_abort_code = -call->app_errno;
-               break;
-       case RXRPC_ESTATE_PEER_ABORT:
-               call->app_errno = afs_abort_to_error(call->app_abort_code);
-               break;
-       default:
-               break;
-       }
+       const __be32 *bp = *_bp;
+
+       fid->vid                = ntohl(*bp++);
+       fid->vnode              = ntohl(*bp++);
+       fid->unique             = ntohl(*bp++);
+       *_bp = bp;
 }
 
 /*
- * get the root volume name from a fileserver
- * - this operation doesn't seem to work correctly in OpenAFS server 1.2.2
+ * decode an AFSFetchStatus block
  */
-#if 0
-int afs_rxfs_get_root_volume(struct afs_server *server,
-                            char *buf, size_t *buflen)
+static void xdr_decode_AFSFetchStatus(const __be32 **_bp,
+                                     struct afs_file_status *status,
+                                     struct afs_vnode *vnode)
 {
-       struct rxrpc_connection *conn;
-       struct rxrpc_call *call;
-       struct kvec piov[2];
-       size_t sent;
-       int ret;
-       u32 param[1];
+       const __be32 *bp = *_bp;
+       umode_t mode;
+       u64 data_version, size;
+       u32 changed = 0; /* becomes non-zero if ctime-type changes seen */
+
+#define EXTRACT(DST)                           \
+       do {                                    \
+               u32 x = ntohl(*bp++);           \
+               changed |= DST - x;             \
+               DST = x;                        \
+       } while (0)
+
+       status->if_version = ntohl(*bp++);
+       EXTRACT(status->type);
+       EXTRACT(status->nlink);
+       size = ntohl(*bp++);
+       data_version = ntohl(*bp++);
+       EXTRACT(status->author);
+       EXTRACT(status->owner);
+       EXTRACT(status->caller_access); /* call ticket dependent */
+       EXTRACT(status->anon_access);
+       EXTRACT(status->mode);
+       EXTRACT(status->parent.vnode);
+       EXTRACT(status->parent.unique);
+       bp++; /* seg size */
+       status->mtime_client = ntohl(*bp++);
+       status->mtime_server = ntohl(*bp++);
+       EXTRACT(status->group);
+       bp++; /* sync counter */
+       data_version |= (u64) ntohl(*bp++) << 32;
+       bp++; /* lock count */
+       size |= (u64) ntohl(*bp++) << 32;
+       bp++; /* spare 4 */
+       *_bp = bp;
+
+       if (size != status->size) {
+               status->size = size;
+               changed |= true;
+       }
+       status->mode &= S_IALLUGO;
+
+       _debug("vnode time %lx, %lx",
+              status->mtime_client, status->mtime_server);
+
+       if (vnode) {
+               status->parent.vid = vnode->fid.vid;
+               if (changed && !test_bit(AFS_VNODE_UNSET, &vnode->flags)) {
+                       _debug("vnode changed");
+                       i_size_write(&vnode->vfs_inode, size);
+                       vnode->vfs_inode.i_uid = status->owner;
+                       vnode->vfs_inode.i_gid = status->group;
+                       vnode->vfs_inode.i_version = vnode->fid.unique;
+                       vnode->vfs_inode.i_nlink = status->nlink;
+
+                       mode = vnode->vfs_inode.i_mode;
+                       mode &= ~S_IALLUGO;
+                       mode |= status->mode;
+                       barrier();
+                       vnode->vfs_inode.i_mode = mode;
+               }
 
-       DECLARE_WAITQUEUE(myself, current);
+               vnode->vfs_inode.i_ctime.tv_sec = status->mtime_server;
+               vnode->vfs_inode.i_mtime        = vnode->vfs_inode.i_ctime;
+               vnode->vfs_inode.i_atime        = vnode->vfs_inode.i_ctime;
+       }
 
-       kenter("%p,%p,%u",server, buf, *buflen);
+       if (status->data_version != data_version) {
+               status->data_version = data_version;
+               if (vnode && !test_bit(AFS_VNODE_UNSET, &vnode->flags)) {
+                       _debug("vnode modified %llx on {%x:%u}",
+                              (unsigned long long) data_version,
+                              vnode->fid.vid, vnode->fid.vnode);
+                       set_bit(AFS_VNODE_MODIFIED, &vnode->flags);
+                       set_bit(AFS_VNODE_ZAP_DATA, &vnode->flags);
+               }
+       }
+}
 
-       /* get hold of the fileserver connection */
-       ret = afs_server_get_fsconn(server, &conn);
-       if (ret < 0)
-               goto out;
+/*
+ * decode an AFSCallBack block
+ */
+static void xdr_decode_AFSCallBack(const __be32 **_bp, struct afs_vnode *vnode)
+{
+       const __be32 *bp = *_bp;
 
-       /* create a call through that connection */
-       ret = rxrpc_create_call(conn, NULL, NULL, afs_rxfs_aemap, &call);
-       if (ret < 0) {
-               printk("kAFS: Unable to create call: %d\n", ret);
-               goto out_put_conn;
-       }
-       call->app_opcode = FSGETROOTVOLUME;
+       vnode->cb_version       = ntohl(*bp++);
+       vnode->cb_expiry        = ntohl(*bp++);
+       vnode->cb_type          = ntohl(*bp++);
+       vnode->cb_expires       = vnode->cb_expiry + get_seconds();
+       *_bp = bp;
+}
 
-       /* we want to get event notifications from the call */
-       add_wait_queue(&call->waitq, &myself);
+static void xdr_decode_AFSCallBack_raw(const __be32 **_bp,
+                                      struct afs_callback *cb)
+{
+       const __be32 *bp = *_bp;
 
-       /* marshall the parameters */
-       param[0] = htonl(FSGETROOTVOLUME);
-
-       piov[0].iov_len = sizeof(param);
-       piov[0].iov_base = param;
-
-       /* send the parameters to the server */
-       ret = rxrpc_call_write_data(call, 1, piov, RXRPC_LAST_PACKET, GFP_NOFS,
-                                   0, &sent);
-       if (ret < 0)
-               goto abort;
-
-       /* wait for the reply to completely arrive */
-       for (;;) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               if (call->app_call_state != RXRPC_CSTATE_CLNT_RCV_REPLY ||
-                   signal_pending(current))
-                       break;
-               schedule();
-       }
-       set_current_state(TASK_RUNNING);
+       cb->version     = ntohl(*bp++);
+       cb->expiry      = ntohl(*bp++);
+       cb->type        = ntohl(*bp++);
+       *_bp = bp;
+}
 
-       ret = -EINTR;
-       if (signal_pending(current))
-               goto abort;
+/*
+ * decode an AFSVolSync block
+ */
+static void xdr_decode_AFSVolSync(const __be32 **_bp,
+                                 struct afs_volsync *volsync)
+{
+       const __be32 *bp = *_bp;
 
-       switch (call->app_call_state) {
-       case RXRPC_CSTATE_ERROR:
-               ret = call->app_errno;
-               kdebug("Got Error: %d", ret);
-               goto out_unwait;
+       volsync->creation = ntohl(*bp++);
+       bp++; /* spare2 */
+       bp++; /* spare3 */
+       bp++; /* spare4 */
+       bp++; /* spare5 */
+       bp++; /* spare6 */
+       *_bp = bp;
+}
 
-       case RXRPC_CSTATE_CLNT_GOT_REPLY:
-               /* read the reply */
-               kdebug("Got Reply: qty=%d", call->app_ready_qty);
+/*
+ * deliver reply data to an FS.FetchStatus
+ */
+static int afs_deliver_fs_fetch_status(struct afs_call *call,
+                                      struct sk_buff *skb, bool last)
+{
+       struct afs_vnode *vnode = call->reply;
+       const __be32 *bp;
 
-               ret = -EBADMSG;
-               if (call->app_ready_qty <= 4)
-                       goto abort;
+       _enter(",,%u", last);
 
-               ret = rxrpc_call_read_data(call, NULL, call->app_ready_qty, 0);
-               if (ret < 0)
-                       goto abort;
+       afs_transfer_reply(call, skb);
+       if (!last)
+               return 0;
 
-#if 0
-               /* unmarshall the reply */
-               bp = buffer;
-               for (loop = 0; loop < 65; loop++)
-                       entry->name[loop] = ntohl(*bp++);
-               entry->name[64] = 0;
+       if (call->reply_size != call->reply_max)
+               return -EBADMSG;
 
-               entry->type = ntohl(*bp++);
-               entry->num_servers = ntohl(*bp++);
+       /* unmarshall the reply once we've received all of it */
+       bp = call->buffer;
+       xdr_decode_AFSFetchStatus(&bp, &vnode->status, vnode);
+       xdr_decode_AFSCallBack(&bp, vnode);
+       if (call->reply2)
+               xdr_decode_AFSVolSync(&bp, call->reply2);
 
-               for (loop = 0; loop < 8; loop++)
-                       entry->servers[loop].addr.s_addr = *bp++;
+       _leave(" = 0 [done]");
+       return 0;
+}
 
-               for (loop = 0; loop < 8; loop++)
-                       entry->servers[loop].partition = ntohl(*bp++);
+/*
+ * FS.FetchStatus operation type
+ */
+static const struct afs_call_type afs_RXFSFetchStatus = {
+       .name           = "FS.FetchStatus",
+       .deliver        = afs_deliver_fs_fetch_status,
+       .abort_to_error = afs_abort_to_error,
+       .destructor     = afs_flat_call_destructor,
+};
 
-               for (loop = 0; loop < 8; loop++)
-                       entry->servers[loop].flags = ntohl(*bp++);
+/*
+ * fetch the status information for a file
+ */
+int afs_fs_fetch_file_status(struct afs_server *server,
+                            struct key *key,
+                            struct afs_vnode *vnode,
+                            struct afs_volsync *volsync,
+                            const struct afs_wait_mode *wait_mode)
+{
+       struct afs_call *call;
+       __be32 *bp;
 
-               for (loop = 0; loop < 3; loop++)
-                       entry->volume_ids[loop] = ntohl(*bp++);
+       _enter(",%x,{%x:%d},,",
+              key_serial(key), vnode->fid.vid, vnode->fid.vnode);
 
-               entry->clone_id = ntohl(*bp++);
-               entry->flags = ntohl(*bp);
-#endif
+       call = afs_alloc_flat_call(&afs_RXFSFetchStatus, 16, (21 + 3 + 6) * 4);
+       if (!call)
+               return -ENOMEM;
 
-               /* success */
-               ret = 0;
-               goto out_unwait;
+       call->key = key;
+       call->reply = vnode;
+       call->reply2 = volsync;
+       call->service_id = FS_SERVICE;
+       call->port = htons(AFS_FS_PORT);
 
-       default:
-               BUG();
-       }
+       /* marshall the parameters */
+       bp = call->request;
+       bp[0] = htonl(FSFETCHSTATUS);
+       bp[1] = htonl(vnode->fid.vid);
+       bp[2] = htonl(vnode->fid.vnode);
+       bp[3] = htonl(vnode->fid.unique);
 
-abort:
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       rxrpc_call_abort(call, ret);
-       schedule();
-out_unwait:
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(&call->waitq, &myself);
-       rxrpc_put_call(call);
-out_put_conn:
-       afs_server_release_fsconn(server, conn);
-out:
-       kleave("");
-       return ret;
+       return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);
 }
-#endif
 
 /*
- * get information about a volume
+ * deliver reply data to an FS.FetchData
  */
-#if 0
-int afs_rxfs_get_volume_info(struct afs_server *server,
-                            const char *name,
-                            struct afs_volume_info *vinfo)
+static int afs_deliver_fs_fetch_data(struct afs_call *call,
+                                    struct sk_buff *skb, bool last)
 {
-       struct rxrpc_connection *conn;
-       struct rxrpc_call *call;
-       struct kvec piov[3];
-       size_t sent;
+       struct afs_vnode *vnode = call->reply;
+       const __be32 *bp;
+       struct page *page;
+       void *buffer;
        int ret;
-       u32 param[2], *bp, zero;
 
-       DECLARE_WAITQUEUE(myself, current);
+       _enter("{%u},{%u},%d", call->unmarshall, skb->len, last);
+
+       switch (call->unmarshall) {
+       case 0:
+               call->offset = 0;
+               call->unmarshall++;
+
+               /* extract the returned data length */
+       case 1:
+               _debug("extract data length");
+               ret = afs_extract_data(call, skb, last, &call->tmp, 4);
+               switch (ret) {
+               case 0:         break;
+               case -EAGAIN:   return 0;
+               default:        return ret;
+               }
 
-       _enter("%p,%s,%p", server, name, vinfo);
+               call->count = ntohl(call->tmp);
+               _debug("DATA length: %u", call->count);
+               if (call->count > PAGE_SIZE)
+                       return -EBADMSG;
+               call->offset = 0;
+               call->unmarshall++;
+
+               if (call->count < PAGE_SIZE) {
+                       page = call->reply3;
+                       buffer = kmap_atomic(page, KM_USER0);
+                       memset(buffer + PAGE_SIZE - call->count, 0,
+                              call->count);
+                       kunmap_atomic(buffer, KM_USER0);
+               }
 
-       /* get hold of the fileserver connection */
-       ret = afs_server_get_fsconn(server, &conn);
-       if (ret < 0)
-               goto out;
+               /* extract the returned data */
+       case 2:
+               _debug("extract data");
+               page = call->reply3;
+               buffer = kmap_atomic(page, KM_USER0);
+               ret = afs_extract_data(call, skb, last, buffer, call->count);
+               kunmap_atomic(buffer, KM_USER0);
+               switch (ret) {
+               case 0:         break;
+               case -EAGAIN:   return 0;
+               default:        return ret;
+               }
 
-       /* create a call through that connection */
-       ret = rxrpc_create_call(conn, NULL, NULL, afs_rxfs_aemap, &call);
-       if (ret < 0) {
-               printk("kAFS: Unable to create call: %d\n", ret);
-               goto out_put_conn;
-       }
-       call->app_opcode = FSGETVOLUMEINFO;
+               call->offset = 0;
+               call->unmarshall++;
+
+               /* extract the metadata */
+       case 3:
+               ret = afs_extract_data(call, skb, last, call->buffer,
+                                      (21 + 3 + 6) * 4);
+               switch (ret) {
+               case 0:         break;
+               case -EAGAIN:   return 0;
+               default:        return ret;
+               }
 
-       /* we want to get event notifications from the call */
-       add_wait_queue(&call->waitq, &myself);
+               bp = call->buffer;
+               xdr_decode_AFSFetchStatus(&bp, &vnode->status, vnode);
+               xdr_decode_AFSCallBack(&bp, vnode);
+               if (call->reply2)
+                       xdr_decode_AFSVolSync(&bp, call->reply2);
 
-       /* marshall the parameters */
-       piov[1].iov_len = strlen(name);
-       piov[1].iov_base = (char *) name;
-
-       zero = 0;
-       piov[2].iov_len = (4 - (piov[1].iov_len & 3)) & 3;
-       piov[2].iov_base = &zero;
-
-       param[0] = htonl(FSGETVOLUMEINFO);
-       param[1] = htonl(piov[1].iov_len);
-
-       piov[0].iov_len = sizeof(param);
-       piov[0].iov_base = param;
-
-       /* send the parameters to the server */
-       ret = rxrpc_call_write_data(call, 3, piov, RXRPC_LAST_PACKET, GFP_NOFS,
-                                   0, &sent);
-       if (ret < 0)
-               goto abort;
-
-       /* wait for the reply to completely arrive */
-       bp = rxrpc_call_alloc_scratch(call, 64);
-
-       ret = rxrpc_call_read_data(call, bp, 64,
-                                  RXRPC_CALL_READ_BLOCK |
-                                  RXRPC_CALL_READ_ALL);
-       if (ret < 0) {
-               if (ret == -ECONNABORTED) {
-                       ret = call->app_errno;
-                       goto out_unwait;
-               }
-               goto abort;
+               call->offset = 0;
+               call->unmarshall++;
+
+       case 4:
+               _debug("trailer");
+               if (skb->len != 0)
+                       return -EBADMSG;
+               break;
        }
 
-       /* unmarshall the reply */
-       vinfo->vid = ntohl(*bp++);
-       vinfo->type = ntohl(*bp++);
-
-       vinfo->type_vids[0] = ntohl(*bp++);
-       vinfo->type_vids[1] = ntohl(*bp++);
-       vinfo->type_vids[2] = ntohl(*bp++);
-       vinfo->type_vids[3] = ntohl(*bp++);
-       vinfo->type_vids[4] = ntohl(*bp++);
-
-       vinfo->nservers = ntohl(*bp++);
-       vinfo->servers[0].addr.s_addr = *bp++;
-       vinfo->servers[1].addr.s_addr = *bp++;
-       vinfo->servers[2].addr.s_addr = *bp++;
-       vinfo->servers[3].addr.s_addr = *bp++;
-       vinfo->servers[4].addr.s_addr = *bp++;
-       vinfo->servers[5].addr.s_addr = *bp++;
-       vinfo->servers[6].addr.s_addr = *bp++;
-       vinfo->servers[7].addr.s_addr = *bp++;
-
-       ret = -EBADMSG;
-       if (vinfo->nservers > 8)
-               goto abort;
-
-       /* success */
-       ret = 0;
-
-out_unwait:
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(&call->waitq, &myself);
-       rxrpc_put_call(call);
-out_put_conn:
-       afs_server_release_fsconn(server, conn);
-out:
-       _leave("");
-       return ret;
-
-abort:
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       rxrpc_call_abort(call, ret);
-       schedule();
-       goto out_unwait;
+       if (!last)
+               return 0;
+
+       _leave(" = 0 [done]");
+       return 0;
 }
-#endif
 
 /*
- * fetch the status information for a file
+ * FS.FetchData operation type
  */
-int afs_rxfs_fetch_file_status(struct afs_server *server,
-                              struct afs_vnode *vnode,
-                              struct afs_volsync *volsync)
+static const struct afs_call_type afs_RXFSFetchData = {
+       .name           = "FS.FetchData",
+       .deliver        = afs_deliver_fs_fetch_data,
+       .abort_to_error = afs_abort_to_error,
+       .destructor     = afs_flat_call_destructor,
+};
+
+/*
+ * fetch data from a file
+ */
+int afs_fs_fetch_data(struct afs_server *server,
+                     struct key *key,
+                     struct afs_vnode *vnode,
+                     off_t offset, size_t length,
+                     struct page *buffer,
+                     const struct afs_wait_mode *wait_mode)
 {
-       struct afs_server_callslot callslot;
-       struct rxrpc_call *call;
-       struct kvec piov[1];
-       size_t sent;
-       int ret;
+       struct afs_call *call;
        __be32 *bp;
 
-       DECLARE_WAITQUEUE(myself, current);
+       _enter("");
 
-       _enter("%p,{%u,%u,%u}",
-              server, vnode->fid.vid, vnode->fid.vnode, vnode->fid.unique);
+       call = afs_alloc_flat_call(&afs_RXFSFetchData, 24, (21 + 3 + 6) * 4);
+       if (!call)
+               return -ENOMEM;
 
-       /* get hold of the fileserver connection */
-       ret = afs_server_request_callslot(server, &callslot);
-       if (ret < 0)
-               goto out;
-
-       /* create a call through that connection */
-       ret = rxrpc_create_call(callslot.conn, NULL, NULL, afs_rxfs_aemap,
-                               &call);
-       if (ret < 0) {
-               printk("kAFS: Unable to create call: %d\n", ret);
-               goto out_put_conn;
-       }
-       call->app_opcode = FSFETCHSTATUS;
-
-       /* we want to get event notifications from the call */
-       add_wait_queue(&call->waitq, &myself);
+       call->key = key;
+       call->reply = vnode;
+       call->reply2 = NULL; /* volsync */
+       call->reply3 = buffer;
+       call->service_id = FS_SERVICE;
+       call->port = htons(AFS_FS_PORT);
 
        /* marshall the parameters */
-       bp = rxrpc_call_alloc_scratch(call, 16);
-       bp[0] = htonl(FSFETCHSTATUS);
+       bp = call->request;
+       bp[0] = htonl(FSFETCHDATA);
        bp[1] = htonl(vnode->fid.vid);
        bp[2] = htonl(vnode->fid.vnode);
        bp[3] = htonl(vnode->fid.unique);
+       bp[4] = htonl(offset);
+       bp[5] = htonl(length);
 
-       piov[0].iov_len = 16;
-       piov[0].iov_base = bp;
-
-       /* send the parameters to the server */
-       ret = rxrpc_call_write_data(call, 1, piov, RXRPC_LAST_PACKET, GFP_NOFS,
-                                   0, &sent);
-       if (ret < 0)
-               goto abort;
-
-       /* wait for the reply to completely arrive */
-       bp = rxrpc_call_alloc_scratch(call, 120);
-
-       ret = rxrpc_call_read_data(call, bp, 120,
-                                  RXRPC_CALL_READ_BLOCK |
-                                  RXRPC_CALL_READ_ALL);
-       if (ret < 0) {
-               if (ret == -ECONNABORTED) {
-                       ret = call->app_errno;
-                       goto out_unwait;
-               }
-               goto abort;
-       }
+       return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);
+}
 
-       /* unmarshall the reply */
-       vnode->status.if_version        = ntohl(*bp++);
-       vnode->status.type              = ntohl(*bp++);
-       vnode->status.nlink             = ntohl(*bp++);
-       vnode->status.size              = ntohl(*bp++);
-       vnode->status.version           = ntohl(*bp++);
-       vnode->status.author            = ntohl(*bp++);
-       vnode->status.owner             = ntohl(*bp++);
-       vnode->status.caller_access     = ntohl(*bp++);
-       vnode->status.anon_access       = ntohl(*bp++);
-       vnode->status.mode              = ntohl(*bp++);
-       vnode->status.parent.vid        = vnode->fid.vid;
-       vnode->status.parent.vnode      = ntohl(*bp++);
-       vnode->status.parent.unique     = ntohl(*bp++);
-       bp++; /* seg size */
-       vnode->status.mtime_client      = ntohl(*bp++);
-       vnode->status.mtime_server      = ntohl(*bp++);
-       bp++; /* group */
-       bp++; /* sync counter */
-       vnode->status.version |= ((unsigned long long) ntohl(*bp++)) << 32;
-       bp++; /* spare2 */
-       bp++; /* spare3 */
-       bp++; /* spare4 */
+/*
+ * deliver reply data to an FS.GiveUpCallBacks
+ */
+static int afs_deliver_fs_give_up_callbacks(struct afs_call *call,
+                                           struct sk_buff *skb, bool last)
+{
+       _enter(",{%u},%d", skb->len, last);
 
-       vnode->cb_version               = ntohl(*bp++);
-       vnode->cb_expiry                = ntohl(*bp++);
-       vnode->cb_type                  = ntohl(*bp++);
-
-       if (volsync) {
-               volsync->creation       = ntohl(*bp++);
-               bp++; /* spare2 */
-               bp++; /* spare3 */
-               bp++; /* spare4 */
-               bp++; /* spare5 */
-               bp++; /* spare6 */
+       if (skb->len > 0)
+               return -EBADMSG; /* shouldn't be any reply data */
+       return 0;
+}
+
+/*
+ * FS.GiveUpCallBacks operation type
+ */
+static const struct afs_call_type afs_RXFSGiveUpCallBacks = {
+       .name           = "FS.GiveUpCallBacks",
+       .deliver        = afs_deliver_fs_give_up_callbacks,
+       .abort_to_error = afs_abort_to_error,
+       .destructor     = afs_flat_call_destructor,
+};
+
+/*
+ * give up a set of callbacks
+ * - the callbacks are held in the server->cb_break ring
+ */
+int afs_fs_give_up_callbacks(struct afs_server *server,
+                            const struct afs_wait_mode *wait_mode)
+{
+       struct afs_call *call;
+       size_t ncallbacks;
+       __be32 *bp, *tp;
+       int loop;
+
+       ncallbacks = CIRC_CNT(server->cb_break_head, server->cb_break_tail,
+                             ARRAY_SIZE(server->cb_break));
+
+       _enter("{%zu},", ncallbacks);
+
+       if (ncallbacks == 0)
+               return 0;
+       if (ncallbacks > AFSCBMAX)
+               ncallbacks = AFSCBMAX;
+
+       _debug("break %zu callbacks", ncallbacks);
+
+       call = afs_alloc_flat_call(&afs_RXFSGiveUpCallBacks,
+                                  12 + ncallbacks * 6 * 4, 0);
+       if (!call)
+               return -ENOMEM;
+
+       call->service_id = FS_SERVICE;
+       call->port = htons(AFS_FS_PORT);
+
+       /* marshall the parameters */
+       bp = call->request;
+       tp = bp + 2 + ncallbacks * 3;
+       *bp++ = htonl(FSGIVEUPCALLBACKS);
+       *bp++ = htonl(ncallbacks);
+       *tp++ = htonl(ncallbacks);
+
+       atomic_sub(ncallbacks, &server->cb_break_n);
+       for (loop = ncallbacks; loop > 0; loop--) {
+               struct afs_callback *cb =
+                       &server->cb_break[server->cb_break_tail];
+
+               *bp++ = htonl(cb->fid.vid);
+               *bp++ = htonl(cb->fid.vnode);
+               *bp++ = htonl(cb->fid.unique);
+               *tp++ = htonl(cb->version);
+               *tp++ = htonl(cb->expiry);
+               *tp++ = htonl(cb->type);
+               smp_mb();
+               server->cb_break_tail =
+                       (server->cb_break_tail + 1) &
+                       (ARRAY_SIZE(server->cb_break) - 1);
        }
 
-       /* success */
-       ret = 0;
-
-out_unwait:
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(&call->waitq, &myself);
-       rxrpc_put_call(call);
-out_put_conn:
-       afs_server_release_callslot(server, &callslot);
-out:
-       _leave("");
-       return ret;
-
-abort:
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       rxrpc_call_abort(call, ret);
-       schedule();
-       goto out_unwait;
+       ASSERT(ncallbacks > 0);
+       wake_up_nr(&server->cb_break_waitq, ncallbacks);
+
+       return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);
 }
 
 /*
- * fetch the contents of a file or directory
+ * deliver reply data to an FS.CreateFile or an FS.MakeDir
  */
-int afs_rxfs_fetch_file_data(struct afs_server *server,
-                            struct afs_vnode *vnode,
-                            struct afs_rxfs_fetch_descriptor *desc,
-                            struct afs_volsync *volsync)
+static int afs_deliver_fs_create_vnode(struct afs_call *call,
+                                      struct sk_buff *skb, bool last)
 {
-       struct afs_server_callslot callslot;
-       struct rxrpc_call *call;
-       struct kvec piov[1];
-       size_t sent;
-       int ret;
+       struct afs_vnode *vnode = call->reply;
+       const __be32 *bp;
+
+       _enter("{%u},{%u},%d", call->unmarshall, skb->len, last);
+
+       afs_transfer_reply(call, skb);
+       if (!last)
+               return 0;
+
+       if (call->reply_size != call->reply_max)
+               return -EBADMSG;
+
+       /* unmarshall the reply once we've received all of it */
+       bp = call->buffer;
+       xdr_decode_AFSFid(&bp, call->reply2);
+       xdr_decode_AFSFetchStatus(&bp, call->reply3, NULL);
+       xdr_decode_AFSFetchStatus(&bp, &vnode->status, vnode);
+       xdr_decode_AFSCallBack_raw(&bp, call->reply4);
+       /* xdr_decode_AFSVolSync(&bp, call->replyX); */
+
+       _leave(" = 0 [done]");
+       return 0;
+}
+
+/*
+ * FS.CreateFile and FS.MakeDir operation type
+ */
+static const struct afs_call_type afs_RXFSCreateXXXX = {
+       .name           = "FS.CreateXXXX",
+       .deliver        = afs_deliver_fs_create_vnode,
+       .abort_to_error = afs_abort_to_error,
+       .destructor     = afs_flat_call_destructor,
+};
+
+/*
+ * create a file or make a directory
+ */
+int afs_fs_create(struct afs_server *server,
+                 struct key *key,
+                 struct afs_vnode *vnode,
+                 const char *name,
+                 umode_t mode,
+                 struct afs_fid *newfid,
+                 struct afs_file_status *newstatus,
+                 struct afs_callback *newcb,
+                 const struct afs_wait_mode *wait_mode)
+{
+       struct afs_call *call;
+       size_t namesz, reqsz, padsz;
        __be32 *bp;
 
-       DECLARE_WAITQUEUE(myself, current);
-
-       _enter("%p,{fid={%u,%u,%u},sz=%Zu,of=%lu}",
-              server,
-              desc->fid.vid,
-              desc->fid.vnode,
-              desc->fid.unique,
-              desc->size,
-              desc->offset);
-
-       /* get hold of the fileserver connection */
-       ret = afs_server_request_callslot(server, &callslot);
-       if (ret < 0)
-               goto out;
-
-       /* create a call through that connection */
-       ret = rxrpc_create_call(callslot.conn, NULL, NULL, afs_rxfs_aemap, &call);
-       if (ret < 0) {
-               printk("kAFS: Unable to create call: %d\n", ret);
-               goto out_put_conn;
-       }
-       call->app_opcode = FSFETCHDATA;
+       _enter("");
+
+       namesz = strlen(name);
+       padsz = (4 - (namesz & 3)) & 3;
+       reqsz = (5 * 4) + namesz + padsz + (6 * 4);
 
-       /* we want to get event notifications from the call */
-       add_wait_queue(&call->waitq, &myself);
+       call = afs_alloc_flat_call(&afs_RXFSCreateXXXX, reqsz,
+                                  (3 + 21 + 21 + 3 + 6) * 4);
+       if (!call)
+               return -ENOMEM;
+
+       call->key = key;
+       call->reply = vnode;
+       call->reply2 = newfid;
+       call->reply3 = newstatus;
+       call->reply4 = newcb;
+       call->service_id = FS_SERVICE;
+       call->port = htons(AFS_FS_PORT);
 
        /* marshall the parameters */
-       bp = rxrpc_call_alloc_scratch(call, 24);
-       bp[0] = htonl(FSFETCHDATA);
-       bp[1] = htonl(desc->fid.vid);
-       bp[2] = htonl(desc->fid.vnode);
-       bp[3] = htonl(desc->fid.unique);
-       bp[4] = htonl(desc->offset);
-       bp[5] = htonl(desc->size);
-
-       piov[0].iov_len = 24;
-       piov[0].iov_base = bp;
-
-       /* send the parameters to the server */
-       ret = rxrpc_call_write_data(call, 1, piov, RXRPC_LAST_PACKET, GFP_NOFS,
-                                   0, &sent);
-       if (ret < 0)
-               goto abort;
-
-       /* wait for the data count to arrive */
-       ret = rxrpc_call_read_data(call, bp, 4, RXRPC_CALL_READ_BLOCK);
-       if (ret < 0)
-               goto read_failed;
-
-       desc->actual = ntohl(bp[0]);
-       if (desc->actual != desc->size) {
-               ret = -EBADMSG;
-               goto abort;
+       bp = call->request;
+       *bp++ = htonl(S_ISDIR(mode) ? FSMAKEDIR : FSCREATEFILE);
+       *bp++ = htonl(vnode->fid.vid);
+       *bp++ = htonl(vnode->fid.vnode);
+       *bp++ = htonl(vnode->fid.unique);
+       *bp++ = htonl(namesz);
+       memcpy(bp, name, namesz);
+       bp = (void *) bp + namesz;
+       if (padsz > 0) {
+               memset(bp, 0, padsz);
+               bp = (void *) bp + padsz;
        }
+       *bp++ = htonl(AFS_SET_MODE);
+       *bp++ = 0; /* mtime */
+       *bp++ = 0; /* owner */
+       *bp++ = 0; /* group */
+       *bp++ = htonl(mode & S_IALLUGO); /* unix mode */
+       *bp++ = 0; /* segment size */
+
+       return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);
+}
 
-       /* call the app to read the actual data */
-       rxrpc_call_reset_scratch(call);
-
-       ret = rxrpc_call_read_data(call, desc->buffer, desc->actual,
-                                  RXRPC_CALL_READ_BLOCK);
-       if (ret < 0)
-               goto read_failed;
-
-       /* wait for the rest of the reply to completely arrive */
-       rxrpc_call_reset_scratch(call);
-       bp = rxrpc_call_alloc_scratch(call, 120);
-
-       ret = rxrpc_call_read_data(call, bp, 120,
-                                  RXRPC_CALL_READ_BLOCK |
-                                  RXRPC_CALL_READ_ALL);
-       if (ret < 0)
-               goto read_failed;
-
-       /* unmarshall the reply */
-       vnode->status.if_version        = ntohl(*bp++);
-       vnode->status.type              = ntohl(*bp++);
-       vnode->status.nlink             = ntohl(*bp++);
-       vnode->status.size              = ntohl(*bp++);
-       vnode->status.version           = ntohl(*bp++);
-       vnode->status.author            = ntohl(*bp++);
-       vnode->status.owner             = ntohl(*bp++);
-       vnode->status.caller_access     = ntohl(*bp++);
-       vnode->status.anon_access       = ntohl(*bp++);
-       vnode->status.mode              = ntohl(*bp++);
-       vnode->status.parent.vid        = desc->fid.vid;
-       vnode->status.parent.vnode      = ntohl(*bp++);
-       vnode->status.parent.unique     = ntohl(*bp++);
-       bp++; /* seg size */
-       vnode->status.mtime_client      = ntohl(*bp++);
-       vnode->status.mtime_server      = ntohl(*bp++);
-       bp++; /* group */
-       bp++; /* sync counter */
-       vnode->status.version |= ((unsigned long long) ntohl(*bp++)) << 32;
-       bp++; /* spare2 */
-       bp++; /* spare3 */
-       bp++; /* spare4 */
+/*
+ * deliver reply data to an FS.RemoveFile or FS.RemoveDir
+ */
+static int afs_deliver_fs_remove(struct afs_call *call,
+                                struct sk_buff *skb, bool last)
+{
+       struct afs_vnode *vnode = call->reply;
+       const __be32 *bp;
 
-       vnode->cb_version               = ntohl(*bp++);
-       vnode->cb_expiry                = ntohl(*bp++);
-       vnode->cb_type                  = ntohl(*bp++);
-
-       if (volsync) {
-               volsync->creation       = ntohl(*bp++);
-               bp++; /* spare2 */
-               bp++; /* spare3 */
-               bp++; /* spare4 */
-               bp++; /* spare5 */
-               bp++; /* spare6 */
-       }
+       _enter("{%u},{%u},%d", call->unmarshall, skb->len, last);
 
-       /* success */
-       ret = 0;
-
-out_unwait:
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(&call->waitq,&myself);
-       rxrpc_put_call(call);
-out_put_conn:
-       afs_server_release_callslot(server, &callslot);
-out:
-       _leave(" = %d", ret);
-       return ret;
-
-read_failed:
-       if (ret == -ECONNABORTED) {
-               ret = call->app_errno;
-               goto out_unwait;
-       }
+       afs_transfer_reply(call, skb);
+       if (!last)
+               return 0;
+
+       if (call->reply_size != call->reply_max)
+               return -EBADMSG;
+
+       /* unmarshall the reply once we've received all of it */
+       bp = call->buffer;
+       xdr_decode_AFSFetchStatus(&bp, &vnode->status, vnode);
+       /* xdr_decode_AFSVolSync(&bp, call->replyX); */
 
-abort:
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       rxrpc_call_abort(call, ret);
-       schedule();
-       goto out_unwait;
+       _leave(" = 0 [done]");
+       return 0;
 }
 
 /*
- * ask the AFS fileserver to discard a callback request on a file
+ * FS.RemoveDir/FS.RemoveFile operation type
  */
-int afs_rxfs_give_up_callback(struct afs_server *server,
-                             struct afs_vnode *vnode)
+static const struct afs_call_type afs_RXFSRemoveXXXX = {
+       .name           = "FS.RemoveXXXX",
+       .deliver        = afs_deliver_fs_remove,
+       .abort_to_error = afs_abort_to_error,
+       .destructor     = afs_flat_call_destructor,
+};
+
+/*
+ * remove a file or directory
+ */
+int afs_fs_remove(struct afs_server *server,
+                 struct key *key,
+                 struct afs_vnode *vnode,
+                 const char *name,
+                 bool isdir,
+                 const struct afs_wait_mode *wait_mode)
 {
-       struct afs_server_callslot callslot;
-       struct rxrpc_call *call;
-       struct kvec piov[1];
-       size_t sent;
-       int ret;
+       struct afs_call *call;
+       size_t namesz, reqsz, padsz;
        __be32 *bp;
 
-       DECLARE_WAITQUEUE(myself, current);
+       _enter("");
 
-       _enter("%p,{%u,%u,%u}",
-              server, vnode->fid.vid, vnode->fid.vnode, vnode->fid.unique);
+       namesz = strlen(name);
+       padsz = (4 - (namesz & 3)) & 3;
+       reqsz = (5 * 4) + namesz + padsz;
 
-       /* get hold of the fileserver connection */
-       ret = afs_server_request_callslot(server, &callslot);
-       if (ret < 0)
-               goto out;
+       call = afs_alloc_flat_call(&afs_RXFSRemoveXXXX, reqsz, (21 + 6) * 4);
+       if (!call)
+               return -ENOMEM;
 
-       /* create a call through that connection */
-       ret = rxrpc_create_call(callslot.conn, NULL, NULL, afs_rxfs_aemap, &call);
-       if (ret < 0) {
-               printk("kAFS: Unable to create call: %d\n", ret);
-               goto out_put_conn;
+       call->key = key;
+       call->reply = vnode;
+       call->service_id = FS_SERVICE;
+       call->port = htons(AFS_FS_PORT);
+
+       /* marshall the parameters */
+       bp = call->request;
+       *bp++ = htonl(isdir ? FSREMOVEDIR : FSREMOVEFILE);
+       *bp++ = htonl(vnode->fid.vid);
+       *bp++ = htonl(vnode->fid.vnode);
+       *bp++ = htonl(vnode->fid.unique);
+       *bp++ = htonl(namesz);
+       memcpy(bp, name, namesz);
+       bp = (void *) bp + namesz;
+       if (padsz > 0) {
+               memset(bp, 0, padsz);
+               bp = (void *) bp + padsz;
        }
-       call->app_opcode = FSGIVEUPCALLBACKS;
 
-       /* we want to get event notifications from the call */
-       add_wait_queue(&call->waitq, &myself);
+       return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);
+}
 
-       /* marshall the parameters */
-       bp = rxrpc_call_alloc_scratch(call, (1 + 4 + 4) * 4);
+/*
+ * deliver reply data to an FS.Link
+ */
+static int afs_deliver_fs_link(struct afs_call *call,
+                              struct sk_buff *skb, bool last)
+{
+       struct afs_vnode *dvnode = call->reply, *vnode = call->reply2;
+       const __be32 *bp;
 
-       piov[0].iov_len = (1 + 4 + 4) * 4;
-       piov[0].iov_base = bp;
+       _enter("{%u},{%u},%d", call->unmarshall, skb->len, last);
 
-       *bp++ = htonl(FSGIVEUPCALLBACKS);
-       *bp++ = htonl(1);
+       afs_transfer_reply(call, skb);
+       if (!last)
+               return 0;
+
+       if (call->reply_size != call->reply_max)
+               return -EBADMSG;
+
+       /* unmarshall the reply once we've received all of it */
+       bp = call->buffer;
+       xdr_decode_AFSFetchStatus(&bp, &vnode->status, vnode);
+       xdr_decode_AFSFetchStatus(&bp, &dvnode->status, dvnode);
+       /* xdr_decode_AFSVolSync(&bp, call->replyX); */
+
+       _leave(" = 0 [done]");
+       return 0;
+}
+
+/*
+ * FS.Link operation type
+ */
+static const struct afs_call_type afs_RXFSLink = {
+       .name           = "FS.Link",
+       .deliver        = afs_deliver_fs_link,
+       .abort_to_error = afs_abort_to_error,
+       .destructor     = afs_flat_call_destructor,
+};
+
+/*
+ * make a hard link
+ */
+int afs_fs_link(struct afs_server *server,
+               struct key *key,
+               struct afs_vnode *dvnode,
+               struct afs_vnode *vnode,
+               const char *name,
+               const struct afs_wait_mode *wait_mode)
+{
+       struct afs_call *call;
+       size_t namesz, reqsz, padsz;
+       __be32 *bp;
+
+       _enter("");
+
+       namesz = strlen(name);
+       padsz = (4 - (namesz & 3)) & 3;
+       reqsz = (5 * 4) + namesz + padsz + (3 * 4);
+
+       call = afs_alloc_flat_call(&afs_RXFSLink, reqsz, (21 + 21 + 6) * 4);
+       if (!call)
+               return -ENOMEM;
+
+       call->key = key;
+       call->reply = dvnode;
+       call->reply2 = vnode;
+       call->service_id = FS_SERVICE;
+       call->port = htons(AFS_FS_PORT);
+
+       /* marshall the parameters */
+       bp = call->request;
+       *bp++ = htonl(FSLINK);
+       *bp++ = htonl(dvnode->fid.vid);
+       *bp++ = htonl(dvnode->fid.vnode);
+       *bp++ = htonl(dvnode->fid.unique);
+       *bp++ = htonl(namesz);
+       memcpy(bp, name, namesz);
+       bp = (void *) bp + namesz;
+       if (padsz > 0) {
+               memset(bp, 0, padsz);
+               bp = (void *) bp + padsz;
+       }
        *bp++ = htonl(vnode->fid.vid);
        *bp++ = htonl(vnode->fid.vnode);
        *bp++ = htonl(vnode->fid.unique);
-       *bp++ = htonl(1);
-       *bp++ = htonl(vnode->cb_version);
-       *bp++ = htonl(vnode->cb_expiry);
-       *bp++ = htonl(vnode->cb_type);
-
-       /* send the parameters to the server */
-       ret = rxrpc_call_write_data(call, 1, piov, RXRPC_LAST_PACKET, GFP_NOFS,
-                                   0, &sent);
-       if (ret < 0)
-               goto abort;
-
-       /* wait for the reply to completely arrive */
-       for (;;) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               if (call->app_call_state != RXRPC_CSTATE_CLNT_RCV_REPLY ||
-                   signal_pending(current))
-                       break;
-               schedule();
-       }
-       set_current_state(TASK_RUNNING);
 
-       ret = -EINTR;
-       if (signal_pending(current))
-               goto abort;
+       return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);
+}
+
+/*
+ * deliver reply data to an FS.Symlink
+ */
+static int afs_deliver_fs_symlink(struct afs_call *call,
+                                 struct sk_buff *skb, bool last)
+{
+       struct afs_vnode *vnode = call->reply;
+       const __be32 *bp;
 
-       switch (call->app_call_state) {
-       case RXRPC_CSTATE_ERROR:
-               ret = call->app_errno;
-               goto out_unwait;
+       _enter("{%u},{%u},%d", call->unmarshall, skb->len, last);
 
-       case RXRPC_CSTATE_CLNT_GOT_REPLY:
-               ret = 0;
-               goto out_unwait;
+       afs_transfer_reply(call, skb);
+       if (!last)
+               return 0;
 
-       default:
-               BUG();
-       }
+       if (call->reply_size != call->reply_max)
+               return -EBADMSG;
 
-out_unwait:
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(&call->waitq, &myself);
-       rxrpc_put_call(call);
-out_put_conn:
-       afs_server_release_callslot(server, &callslot);
-out:
-       _leave("");
-       return ret;
-
-abort:
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       rxrpc_call_abort(call, ret);
-       schedule();
-       goto out_unwait;
+       /* unmarshall the reply once we've received all of it */
+       bp = call->buffer;
+       xdr_decode_AFSFid(&bp, call->reply2);
+       xdr_decode_AFSFetchStatus(&bp, call->reply3, NULL);
+       xdr_decode_AFSFetchStatus(&bp, &vnode->status, vnode);
+       /* xdr_decode_AFSVolSync(&bp, call->replyX); */
+
+       _leave(" = 0 [done]");
+       return 0;
 }
 
 /*
- * look a filename up in a directory
- * - this operation doesn't seem to work correctly in OpenAFS server 1.2.2
+ * FS.Symlink operation type
  */
-#if 0
-int afs_rxfs_lookup(struct afs_server *server,
-                   struct afs_vnode *dir,
-                   const char *filename,
-                   struct afs_vnode *vnode,
-                   struct afs_volsync *volsync)
+static const struct afs_call_type afs_RXFSSymlink = {
+       .name           = "FS.Symlink",
+       .deliver        = afs_deliver_fs_symlink,
+       .abort_to_error = afs_abort_to_error,
+       .destructor     = afs_flat_call_destructor,
+};
+
+/*
+ * create a symbolic link
+ */
+int afs_fs_symlink(struct afs_server *server,
+                  struct key *key,
+                  struct afs_vnode *vnode,
+                  const char *name,
+                  const char *contents,
+                  struct afs_fid *newfid,
+                  struct afs_file_status *newstatus,
+                  const struct afs_wait_mode *wait_mode)
 {
-       struct rxrpc_connection *conn;
-       struct rxrpc_call *call;
-       struct kvec piov[3];
-       size_t sent;
-       int ret;
-       u32 *bp, zero;
+       struct afs_call *call;
+       size_t namesz, reqsz, padsz, c_namesz, c_padsz;
+       __be32 *bp;
 
-       DECLARE_WAITQUEUE(myself, current);
+       _enter("");
 
-       kenter("%p,{%u,%u,%u},%s",
-              server, fid->vid, fid->vnode, fid->unique, filename);
+       namesz = strlen(name);
+       padsz = (4 - (namesz & 3)) & 3;
 
-       /* get hold of the fileserver connection */
-       ret = afs_server_get_fsconn(server, &conn);
-       if (ret < 0)
-               goto out;
+       c_namesz = strlen(contents);
+       c_padsz = (4 - (c_namesz & 3)) & 3;
 
-       /* create a call through that connection */
-       ret = rxrpc_create_call(conn, NULL, NULL, afs_rxfs_aemap, &call);
-       if (ret < 0) {
-               printk("kAFS: Unable to create call: %d\n", ret);
-               goto out_put_conn;
-       }
-       call->app_opcode = FSLOOKUP;
+       reqsz = (6 * 4) + namesz + padsz + c_namesz + c_padsz + (6 * 4);
+
+       call = afs_alloc_flat_call(&afs_RXFSSymlink, reqsz,
+                                  (3 + 21 + 21 + 6) * 4);
+       if (!call)
+               return -ENOMEM;
 
-       /* we want to get event notifications from the call */
-       add_wait_queue(&call->waitq,&myself);
+       call->key = key;
+       call->reply = vnode;
+       call->reply2 = newfid;
+       call->reply3 = newstatus;
+       call->service_id = FS_SERVICE;
+       call->port = htons(AFS_FS_PORT);
 
        /* marshall the parameters */
-       bp = rxrpc_call_alloc_scratch(call, 20);
-
-       zero = 0;
-
-       piov[0].iov_len = 20;
-       piov[0].iov_base = bp;
-       piov[1].iov_len = strlen(filename);
-       piov[1].iov_base = (char *) filename;
-       piov[2].iov_len = (4 - (piov[1].iov_len & 3)) & 3;
-       piov[2].iov_base = &zero;
-
-       *bp++ = htonl(FSLOOKUP);
-       *bp++ = htonl(dirfid->vid);
-       *bp++ = htonl(dirfid->vnode);
-       *bp++ = htonl(dirfid->unique);
-       *bp++ = htonl(piov[1].iov_len);
-
-       /* send the parameters to the server */
-       ret = rxrpc_call_write_data(call, 3, piov, RXRPC_LAST_PACKET, GFP_NOFS,
-                                   0, &sent);
-       if (ret < 0)
-               goto abort;
-
-       /* wait for the reply to completely arrive */
-       bp = rxrpc_call_alloc_scratch(call, 220);
-
-       ret = rxrpc_call_read_data(call, bp, 220,
-                                  RXRPC_CALL_READ_BLOCK |
-                                  RXRPC_CALL_READ_ALL);
-       if (ret < 0) {
-               if (ret == -ECONNABORTED) {
-                       ret = call->app_errno;
-                       goto out_unwait;
-               }
-               goto abort;
+       bp = call->request;
+       *bp++ = htonl(FSSYMLINK);
+       *bp++ = htonl(vnode->fid.vid);
+       *bp++ = htonl(vnode->fid.vnode);
+       *bp++ = htonl(vnode->fid.unique);
+       *bp++ = htonl(namesz);
+       memcpy(bp, name, namesz);
+       bp = (void *) bp + namesz;
+       if (padsz > 0) {
+               memset(bp, 0, padsz);
+               bp = (void *) bp + padsz;
+       }
+       *bp++ = htonl(c_namesz);
+       memcpy(bp, contents, c_namesz);
+       bp = (void *) bp + c_namesz;
+       if (c_padsz > 0) {
+               memset(bp, 0, c_padsz);
+               bp = (void *) bp + c_padsz;
        }
+       *bp++ = htonl(AFS_SET_MODE);
+       *bp++ = 0; /* mtime */
+       *bp++ = 0; /* owner */
+       *bp++ = 0; /* group */
+       *bp++ = htonl(S_IRWXUGO); /* unix mode */
+       *bp++ = 0; /* segment size */
+
+       return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);
+}
 
-       /* unmarshall the reply */
-       fid->vid                = ntohl(*bp++);
-       fid->vnode              = ntohl(*bp++);
-       fid->unique             = ntohl(*bp++);
+/*
+ * deliver reply data to an FS.Rename
+ */
+static int afs_deliver_fs_rename(struct afs_call *call,
+                                 struct sk_buff *skb, bool last)
+{
+       struct afs_vnode *orig_dvnode = call->reply, *new_dvnode = call->reply2;
+       const __be32 *bp;
 
-       vnode->status.if_version        = ntohl(*bp++);
-       vnode->status.type              = ntohl(*bp++);
-       vnode->status.nlink             = ntohl(*bp++);
-       vnode->status.size              = ntohl(*bp++);
-       vnode->status.version           = ntohl(*bp++);
-       vnode->status.author            = ntohl(*bp++);
-       vnode->status.owner             = ntohl(*bp++);
-       vnode->status.caller_access     = ntohl(*bp++);
-       vnode->status.anon_access       = ntohl(*bp++);
-       vnode->status.mode              = ntohl(*bp++);
-       vnode->status.parent.vid        = dirfid->vid;
-       vnode->status.parent.vnode      = ntohl(*bp++);
-       vnode->status.parent.unique     = ntohl(*bp++);
-       bp++; /* seg size */
-       vnode->status.mtime_client      = ntohl(*bp++);
-       vnode->status.mtime_server      = ntohl(*bp++);
-       bp++; /* group */
-       bp++; /* sync counter */
-       vnode->status.version |= ((unsigned long long) ntohl(*bp++)) << 32;
-       bp++; /* spare2 */
-       bp++; /* spare3 */
-       bp++; /* spare4 */
+       _enter("{%u},{%u},%d", call->unmarshall, skb->len, last);
 
-       dir->status.if_version          = ntohl(*bp++);
-       dir->status.type                = ntohl(*bp++);
-       dir->status.nlink               = ntohl(*bp++);
-       dir->status.size                = ntohl(*bp++);
-       dir->status.version             = ntohl(*bp++);
-       dir->status.author              = ntohl(*bp++);
-       dir->status.owner               = ntohl(*bp++);
-       dir->status.caller_access       = ntohl(*bp++);
-       dir->status.anon_access         = ntohl(*bp++);
-       dir->status.mode                = ntohl(*bp++);
-       dir->status.parent.vid          = dirfid->vid;
-       dir->status.parent.vnode        = ntohl(*bp++);
-       dir->status.parent.unique       = ntohl(*bp++);
-       bp++; /* seg size */
-       dir->status.mtime_client        = ntohl(*bp++);
-       dir->status.mtime_server        = ntohl(*bp++);
-       bp++; /* group */
-       bp++; /* sync counter */
-       dir->status.version |= ((unsigned long long) ntohl(*bp++)) << 32;
-       bp++; /* spare2 */
-       bp++; /* spare3 */
-       bp++; /* spare4 */
+       afs_transfer_reply(call, skb);
+       if (!last)
+               return 0;
+
+       if (call->reply_size != call->reply_max)
+               return -EBADMSG;
+
+       /* unmarshall the reply once we've received all of it */
+       bp = call->buffer;
+       xdr_decode_AFSFetchStatus(&bp, &orig_dvnode->status, orig_dvnode);
+       if (new_dvnode != orig_dvnode)
+               xdr_decode_AFSFetchStatus(&bp, &new_dvnode->status, new_dvnode);
+       /* xdr_decode_AFSVolSync(&bp, call->replyX); */
+
+       _leave(" = 0 [done]");
+       return 0;
+}
+
+/*
+ * FS.Rename operation type
+ */
+static const struct afs_call_type afs_RXFSRename = {
+       .name           = "FS.Rename",
+       .deliver        = afs_deliver_fs_rename,
+       .abort_to_error = afs_abort_to_error,
+       .destructor     = afs_flat_call_destructor,
+};
+
+/*
+ * create a symbolic link
+ */
+int afs_fs_rename(struct afs_server *server,
+                 struct key *key,
+                 struct afs_vnode *orig_dvnode,
+                 const char *orig_name,
+                 struct afs_vnode *new_dvnode,
+                 const char *new_name,
+                 const struct afs_wait_mode *wait_mode)
+{
+       struct afs_call *call;
+       size_t reqsz, o_namesz, o_padsz, n_namesz, n_padsz;
+       __be32 *bp;
+
+       _enter("");
+
+       o_namesz = strlen(orig_name);
+       o_padsz = (4 - (o_namesz & 3)) & 3;
+
+       n_namesz = strlen(new_name);
+       n_padsz = (4 - (n_namesz & 3)) & 3;
+
+       reqsz = (4 * 4) +
+               4 + o_namesz + o_padsz +
+               (3 * 4) +
+               4 + n_namesz + n_padsz;
+
+       call = afs_alloc_flat_call(&afs_RXFSRename, reqsz, (21 + 21 + 6) * 4);
+       if (!call)
+               return -ENOMEM;
+
+       call->key = key;
+       call->reply = orig_dvnode;
+       call->reply2 = new_dvnode;
+       call->service_id = FS_SERVICE;
+       call->port = htons(AFS_FS_PORT);
+
+       /* marshall the parameters */
+       bp = call->request;
+       *bp++ = htonl(FSRENAME);
+       *bp++ = htonl(orig_dvnode->fid.vid);
+       *bp++ = htonl(orig_dvnode->fid.vnode);
+       *bp++ = htonl(orig_dvnode->fid.unique);
+       *bp++ = htonl(o_namesz);
+       memcpy(bp, orig_name, o_namesz);
+       bp = (void *) bp + o_namesz;
+       if (o_padsz > 0) {
+               memset(bp, 0, o_padsz);
+               bp = (void *) bp + o_padsz;
+       }
 
-       callback->fid           = *fid;
-       callback->version       = ntohl(*bp++);
-       callback->expiry        = ntohl(*bp++);
-       callback->type          = ntohl(*bp++);
-
-       if (volsync) {
-               volsync->creation       = ntohl(*bp++);
-               bp++; /* spare2 */
-               bp++; /* spare3 */
-               bp++; /* spare4 */
-               bp++; /* spare5 */
-               bp++; /* spare6 */
+       *bp++ = htonl(new_dvnode->fid.vid);
+       *bp++ = htonl(new_dvnode->fid.vnode);
+       *bp++ = htonl(new_dvnode->fid.unique);
+       *bp++ = htonl(n_namesz);
+       memcpy(bp, new_name, n_namesz);
+       bp = (void *) bp + n_namesz;
+       if (n_padsz > 0) {
+               memset(bp, 0, n_padsz);
+               bp = (void *) bp + n_padsz;
        }
 
-       /* success */
-       ret = 0;
-
-out_unwait:
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(&call->waitq, &myself);
-       rxrpc_put_call(call);
-out_put_conn:
-       afs_server_release_fsconn(server, conn);
-out:
-       kleave("");
-       return ret;
-
-abort:
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       rxrpc_call_abort(call, ret);
-       schedule();
-       goto out_unwait;
+       return afs_make_call(&server->addr, call, GFP_NOFS, wait_mode);
 }
-#endif