linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / nfs / proc.c

diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 9dd85ca..f5150d7 100644 (file)
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -58,23 +58,16 @@ nfs_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
 {
        struct nfs_fattr *fattr = info->fattr;
        struct nfs2_fsstat fsinfo;
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_GETATTR],
-               .rpc_argp       = fhandle,
-               .rpc_resp       = fattr,
-       };
        int status;
 
        dprintk("%s: call getattr\n", __FUNCTION__);
        nfs_fattr_init(fattr);
-       status = rpc_call_sync(server->client_sys, &msg, 0);
+       status = rpc_call(server->client_sys, NFSPROC_GETATTR, fhandle, fattr, 0);
        dprintk("%s: reply getattr: %d\n", __FUNCTION__, status);
        if (status)
                return status;
        dprintk("%s: call statfs\n", __FUNCTION__);
-       msg.rpc_proc = &nfs_procedures[NFSPROC_STATFS];
-       msg.rpc_resp = &fsinfo;
-       status = rpc_call_sync(server->client_sys, &msg, 0);
+       status = rpc_call(server->client_sys, NFSPROC_STATFS, fhandle, &fsinfo, 0);
        dprintk("%s: reply statfs: %d\n", __FUNCTION__, status);
        if (status)
                return status;
@@ -97,16 +90,12 @@ static int
 nfs_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle,
                struct nfs_fattr *fattr)
 {
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_GETATTR],
-               .rpc_argp       = fhandle,
-               .rpc_resp       = fattr,
-       };
        int     status;
 
        dprintk("NFS call  getattr\n");
        nfs_fattr_init(fattr);
-       status = rpc_call_sync(server->client, &msg, 0);
+       status = rpc_call(server->client, NFSPROC_GETATTR,
+                               fhandle, fattr, 0);
        dprintk("NFS reply getattr: %d\n", status);
        return status;
 }
@@ -120,11 +109,6 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
                .fh     = NFS_FH(inode),
                .sattr  = sattr
        };
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_SETATTR],
-               .rpc_argp       = &arg,
-               .rpc_resp       = fattr,
-       };
        int     status;
 
        /* Mask out the non-modebit related stuff from attr->ia_mode */
@@ -132,7 +116,7 @@ nfs_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
 
        dprintk("NFS call  setattr\n");
        nfs_fattr_init(fattr);
-       status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
+       status = rpc_call(NFS_CLIENT(inode), NFSPROC_SETATTR, &arg, fattr, 0);
        if (status == 0)
                nfs_setattr_update_inode(inode, sattr);
        dprintk("NFS reply setattr: %d\n", status);
@@ -152,16 +136,11 @@ nfs_proc_lookup(struct inode *dir, struct qstr *name,
                .fh             = fhandle,
                .fattr          = fattr
        };
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_LOOKUP],
-               .rpc_argp       = &arg,
-               .rpc_resp       = &res,
-       };
        int                     status;
 
        dprintk("NFS call  lookup %s\n", name->name);
        nfs_fattr_init(fattr);
-       status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+       status = rpc_call(NFS_CLIENT(dir), NFSPROC_LOOKUP, &arg, &res, 0);
        dprintk("NFS reply lookup: %d\n", status);
        return status;
 }
@@ -175,14 +154,10 @@ static int nfs_proc_readlink(struct inode *inode, struct page *page,
                .pglen          = pglen,
                .pages          = &page
        };
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_READLINK],
-               .rpc_argp       = &args,
-       };
        int                     status;
 
        dprintk("NFS call  readlink\n");
-       status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
+       status = rpc_call(NFS_CLIENT(inode), NFSPROC_READLINK, &args, NULL, 0);
        dprintk("NFS reply readlink: %d\n", status);
        return status;
 }
@@ -258,16 +233,11 @@ nfs_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
                .fh             = &fhandle,
                .fattr          = &fattr
        };
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_CREATE],
-               .rpc_argp       = &arg,
-               .rpc_resp       = &res,
-       };
        int                     status;
 
        nfs_fattr_init(&fattr);
        dprintk("NFS call  create %s\n", dentry->d_name.name);
-       status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+       status = rpc_call(NFS_CLIENT(dir), NFSPROC_CREATE, &arg, &res, 0);
        if (status == 0)
                status = nfs_instantiate(dentry, &fhandle, &fattr);
        dprintk("NFS reply create: %d\n", status);
@@ -293,11 +263,6 @@ nfs_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
                .fh             = &fhandle,
                .fattr          = &fattr
        };
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_CREATE],
-               .rpc_argp       = &arg,
-               .rpc_resp       = &res,
-       };
        int status, mode;
 
        dprintk("NFS call  mknod %s\n", dentry->d_name.name);
@@ -312,13 +277,13 @@ nfs_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
        }
 
        nfs_fattr_init(&fattr);
-       status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+       status = rpc_call(NFS_CLIENT(dir), NFSPROC_CREATE, &arg, &res, 0);
        nfs_mark_for_revalidate(dir);
 
        if (status == -EINVAL && S_ISFIFO(mode)) {
                sattr->ia_mode = mode;
                nfs_fattr_init(&fattr);
-               status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+               status = rpc_call(NFS_CLIENT(dir), NFSPROC_CREATE, &arg, &res, 0);
        }
        if (status == 0)
                status = nfs_instantiate(dentry, &fhandle, &fattr);
@@ -337,6 +302,8 @@ nfs_proc_remove(struct inode *dir, struct qstr *name)
        struct rpc_message      msg = { 
                .rpc_proc       = &nfs_procedures[NFSPROC_REMOVE],
                .rpc_argp       = &arg,
+               .rpc_resp       = NULL,
+               .rpc_cred       = NULL
        };
        int                     status;
 
@@ -388,14 +355,10 @@ nfs_proc_rename(struct inode *old_dir, struct qstr *old_name,
                .toname         = new_name->name,
                .tolen          = new_name->len
        };
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_RENAME],
-               .rpc_argp       = &arg,
-       };
        int                     status;
 
        dprintk("NFS call  rename %s -> %s\n", old_name->name, new_name->name);
-       status = rpc_call_sync(NFS_CLIENT(old_dir), &msg, 0);
+       status = rpc_call(NFS_CLIENT(old_dir), NFSPROC_RENAME, &arg, NULL, 0);
        nfs_mark_for_revalidate(old_dir);
        nfs_mark_for_revalidate(new_dir);
        dprintk("NFS reply rename: %d\n", status);
@@ -411,14 +374,10 @@ nfs_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
                .toname         = name->name,
                .tolen          = name->len
        };
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_LINK],
-               .rpc_argp       = &arg,
-       };
        int                     status;
 
        dprintk("NFS call  link %s\n", name->name);
-       status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
+       status = rpc_call(NFS_CLIENT(inode), NFSPROC_LINK, &arg, NULL, 0);
        nfs_mark_for_revalidate(inode);
        nfs_mark_for_revalidate(dir);
        dprintk("NFS reply link: %d\n", status);
@@ -438,10 +397,6 @@ nfs_proc_symlink(struct inode *dir, struct qstr *name, struct qstr *path,
                .tolen          = path->len,
                .sattr          = sattr
        };
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_SYMLINK],
-               .rpc_argp       = &arg,
-       };
        int                     status;
 
        if (path->len > NFS2_MAXPATHLEN)
@@ -449,7 +404,7 @@ nfs_proc_symlink(struct inode *dir, struct qstr *name, struct qstr *path,
        dprintk("NFS call  symlink %s -> %s\n", name->name, path->name);
        nfs_fattr_init(fattr);
        fhandle->size = 0;
-       status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+       status = rpc_call(NFS_CLIENT(dir), NFSPROC_SYMLINK, &arg, NULL, 0);
        nfs_mark_for_revalidate(dir);
        dprintk("NFS reply symlink: %d\n", status);
        return status;
@@ -470,16 +425,11 @@ nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
                .fh             = &fhandle,
                .fattr          = &fattr
        };
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_MKDIR],
-               .rpc_argp       = &arg,
-               .rpc_resp       = &res,
-       };
        int                     status;
 
        dprintk("NFS call  mkdir %s\n", dentry->d_name.name);
        nfs_fattr_init(&fattr);
-       status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+       status = rpc_call(NFS_CLIENT(dir), NFSPROC_MKDIR, &arg, &res, 0);
        nfs_mark_for_revalidate(dir);
        if (status == 0)
                status = nfs_instantiate(dentry, &fhandle, &fattr);
@@ -495,14 +445,10 @@ nfs_proc_rmdir(struct inode *dir, struct qstr *name)
                .name           = name->name,
                .len            = name->len
        };
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_RMDIR],
-               .rpc_argp       = &arg,
-       };
        int                     status;
 
        dprintk("NFS call  rmdir %s\n", name->name);
-       status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+       status = rpc_call(NFS_CLIENT(dir), NFSPROC_RMDIR, &arg, NULL, 0);
        nfs_mark_for_revalidate(dir);
        dprintk("NFS reply rmdir: %d\n", status);
        return status;
@@ -524,12 +470,13 @@ nfs_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
                .fh             = NFS_FH(dir),
                .cookie         = cookie,
                .count          = count,
-               .pages          = &page,
+               .pages          = &page
        };
        struct rpc_message      msg = {
                .rpc_proc       = &nfs_procedures[NFSPROC_READDIR],
                .rpc_argp       = &arg,
-               .rpc_cred       = cred,
+               .rpc_resp       = NULL,
+               .rpc_cred       = cred
        };
        int                     status;
 
@@ -548,16 +495,11 @@ nfs_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle,
                        struct nfs_fsstat *stat)
 {
        struct nfs2_fsstat fsinfo;
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_STATFS],
-               .rpc_argp       = fhandle,
-               .rpc_resp       = &fsinfo,
-       };
        int     status;
 
        dprintk("NFS call  statfs\n");
        nfs_fattr_init(stat->fattr);
-       status = rpc_call_sync(server->client, &msg, 0);
+       status = rpc_call(server->client, NFSPROC_STATFS, fhandle, &fsinfo, 0);
        dprintk("NFS reply statfs: %d\n", status);
        if (status)
                goto out;
@@ -576,16 +518,11 @@ nfs_proc_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle,
                        struct nfs_fsinfo *info)
 {
        struct nfs2_fsstat fsinfo;
-       struct rpc_message msg = {
-               .rpc_proc       = &nfs_procedures[NFSPROC_STATFS],
-               .rpc_argp       = fhandle,
-               .rpc_resp       = &fsinfo,
-       };
        int     status;
 
        dprintk("NFS call  fsinfo\n");
        nfs_fattr_init(info->fattr);
-       status = rpc_call_sync(server->client, &msg, 0);
+       status = rpc_call(server->client, NFSPROC_STATFS, fhandle, &fsinfo, 0);
        dprintk("NFS reply fsinfo: %d\n", status);
        if (status)
                goto out;
@@ -613,8 +550,10 @@ nfs_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,
 
 extern u32 * nfs_decode_dirent(u32 *, struct nfs_entry *, int);
 
-static int nfs_read_done(struct rpc_task *task, struct nfs_read_data *data)
+static void nfs_read_done(struct rpc_task *task, void *calldata)
 {
+       struct nfs_read_data *data = calldata;
+
        if (task->tk_status >= 0) {
                nfs_refresh_inode(data->inode, data->res.fattr);
                /* Emulate the eof flag, which isn't normally needed in NFSv2
@@ -623,11 +562,20 @@ static int nfs_read_done(struct rpc_task *task, struct nfs_read_data *data)
                if (data->args.offset + data->args.count >= data->res.fattr->size)
                        data->res.eof = 1;
        }
-       return 0;
+       nfs_readpage_result(task, calldata);
 }
 
-static void nfs_proc_read_setup(struct nfs_read_data *data)
+static const struct rpc_call_ops nfs_read_ops = {
+       .rpc_call_done = nfs_read_done,
+       .rpc_release = nfs_readdata_release,
+};
+
+static void
+nfs_proc_read_setup(struct nfs_read_data *data)
 {
+       struct rpc_task         *task = &data->task;
+       struct inode            *inode = data->inode;
+       int                     flags;
        struct rpc_message      msg = {
                .rpc_proc       = &nfs_procedures[NFSPROC_READ],
                .rpc_argp       = &data->args,
@@ -635,18 +583,34 @@ static void nfs_proc_read_setup(struct nfs_read_data *data)
                .rpc_cred       = data->cred,
        };
 
-       rpc_call_setup(&data->task, &msg, 0);
+       /* N.B. Do we need to test? Never called for swapfile inode */
+       flags = RPC_TASK_ASYNC | (IS_SWAPFILE(inode)? NFS_RPC_SWAPFLAGS : 0);
+
+       /* Finalize the task. */
+       rpc_init_task(task, NFS_CLIENT(inode), flags, &nfs_read_ops, data);
+       rpc_call_setup(task, &msg, 0);
 }
 
-static int nfs_write_done(struct rpc_task *task, struct nfs_write_data *data)
+static void nfs_write_done(struct rpc_task *task, void *calldata)
 {
+       struct nfs_write_data *data = calldata;
+
        if (task->tk_status >= 0)
                nfs_post_op_update_inode(data->inode, data->res.fattr);
-       return 0;
+       nfs_writeback_done(task, calldata);
 }
 
-static void nfs_proc_write_setup(struct nfs_write_data *data, int how)
+static const struct rpc_call_ops nfs_write_ops = {
+       .rpc_call_done = nfs_write_done,
+       .rpc_release = nfs_writedata_release,
+};
+
+static void
+nfs_proc_write_setup(struct nfs_write_data *data, int how)
 {
+       struct rpc_task         *task = &data->task;
+       struct inode            *inode = data->inode;
+       int                     flags;
        struct rpc_message      msg = {
                .rpc_proc       = &nfs_procedures[NFSPROC_WRITE],
                .rpc_argp       = &data->args,
@@ -657,8 +621,12 @@ static void nfs_proc_write_setup(struct nfs_write_data *data, int how)
        /* Note: NFSv2 ignores @stable and always uses NFS_FILE_SYNC */
        data->args.stable = NFS_FILE_SYNC;
 
+       /* Set the initial flags for the task.  */
+       flags = (how & FLUSH_SYNC) ? 0 : RPC_TASK_ASYNC;
+
        /* Finalize the task. */
-       rpc_call_setup(&data->task, &msg, 0);
+       rpc_init_task(task, NFS_CLIENT(inode), flags, &nfs_write_ops, data);
+       rpc_call_setup(task, &msg, 0);
 }
 
 static void
@@ -704,9 +672,7 @@ struct nfs_rpc_ops  nfs_v2_clientops = {
        .pathconf       = nfs_proc_pathconf,
        .decode_dirent  = nfs_decode_dirent,
        .read_setup     = nfs_proc_read_setup,
-       .read_done      = nfs_read_done,
        .write_setup    = nfs_proc_write_setup,
-       .write_done     = nfs_write_done,
        .commit_setup   = nfs_proc_commit_setup,
        .file_open      = nfs_open,
        .file_release   = nfs_release,