diff options
Diffstat (limited to 'fs/nfs/nfs3proc.c')
-rw-r--r-- | fs/nfs/nfs3proc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index f5c84c3efbca..90cb10d7b693 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c | |||
@@ -336,8 +336,8 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, | |||
336 | data->arg.create.createmode = NFS3_CREATE_UNCHECKED; | 336 | data->arg.create.createmode = NFS3_CREATE_UNCHECKED; |
337 | if (flags & O_EXCL) { | 337 | if (flags & O_EXCL) { |
338 | data->arg.create.createmode = NFS3_CREATE_EXCLUSIVE; | 338 | data->arg.create.createmode = NFS3_CREATE_EXCLUSIVE; |
339 | data->arg.create.verifier[0] = jiffies; | 339 | data->arg.create.verifier[0] = cpu_to_be32(jiffies); |
340 | data->arg.create.verifier[1] = current->pid; | 340 | data->arg.create.verifier[1] = cpu_to_be32(current->pid); |
341 | } | 341 | } |
342 | 342 | ||
343 | sattr->ia_mode &= ~current_umask(); | 343 | sattr->ia_mode &= ~current_umask(); |
@@ -826,9 +826,10 @@ static void nfs3_proc_read_setup(struct nfs_read_data *data, struct rpc_message | |||
826 | msg->rpc_proc = &nfs3_procedures[NFS3PROC_READ]; | 826 | msg->rpc_proc = &nfs3_procedures[NFS3PROC_READ]; |
827 | } | 827 | } |
828 | 828 | ||
829 | static void nfs3_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_read_data *data) | 829 | static int nfs3_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_read_data *data) |
830 | { | 830 | { |
831 | rpc_call_start(task); | 831 | rpc_call_start(task); |
832 | return 0; | ||
832 | } | 833 | } |
833 | 834 | ||
834 | static int nfs3_write_done(struct rpc_task *task, struct nfs_write_data *data) | 835 | static int nfs3_write_done(struct rpc_task *task, struct nfs_write_data *data) |
@@ -847,9 +848,10 @@ static void nfs3_proc_write_setup(struct nfs_write_data *data, struct rpc_messag | |||
847 | msg->rpc_proc = &nfs3_procedures[NFS3PROC_WRITE]; | 848 | msg->rpc_proc = &nfs3_procedures[NFS3PROC_WRITE]; |
848 | } | 849 | } |
849 | 850 | ||
850 | static void nfs3_proc_write_rpc_prepare(struct rpc_task *task, struct nfs_write_data *data) | 851 | static int nfs3_proc_write_rpc_prepare(struct rpc_task *task, struct nfs_write_data *data) |
851 | { | 852 | { |
852 | rpc_call_start(task); | 853 | rpc_call_start(task); |
854 | return 0; | ||
853 | } | 855 | } |
854 | 856 | ||
855 | static void nfs3_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit_data *data) | 857 | static void nfs3_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit_data *data) |