diff options
Diffstat (limited to 'fs/nfs/blocklayout')
-rw-r--r-- | fs/nfs/blocklayout/blocklayout.c | 2 | ||||
-rw-r--r-- | fs/nfs/blocklayout/blocklayout.h | 2 | ||||
-rw-r--r-- | fs/nfs/blocklayout/blocklayoutdev.c | 22 |
3 files changed, 1 insertions, 25 deletions
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index d2432f0dc40..dc23833c023 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c | |||
@@ -964,7 +964,7 @@ static struct pnfs_layoutdriver_type blocklayout_type = { | |||
964 | }; | 964 | }; |
965 | 965 | ||
966 | static const struct rpc_pipe_ops bl_upcall_ops = { | 966 | static const struct rpc_pipe_ops bl_upcall_ops = { |
967 | .upcall = bl_pipe_upcall, | 967 | .upcall = rpc_pipe_generic_upcall, |
968 | .downcall = bl_pipe_downcall, | 968 | .downcall = bl_pipe_downcall, |
969 | .destroy_msg = bl_pipe_destroy_msg, | 969 | .destroy_msg = bl_pipe_destroy_msg, |
970 | }; | 970 | }; |
diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklayout.h index 58dc256402e..42acf7ef599 100644 --- a/fs/nfs/blocklayout/blocklayout.h +++ b/fs/nfs/blocklayout/blocklayout.h | |||
@@ -169,8 +169,6 @@ extern wait_queue_head_t bl_wq; | |||
169 | #define BL_DEVICE_REQUEST_ERR 0x2 /* User level process fails */ | 169 | #define BL_DEVICE_REQUEST_ERR 0x2 /* User level process fails */ |
170 | 170 | ||
171 | /* blocklayoutdev.c */ | 171 | /* blocklayoutdev.c */ |
172 | ssize_t bl_pipe_upcall(struct file *, struct rpc_pipe_msg *, | ||
173 | char __user *, size_t); | ||
174 | ssize_t bl_pipe_downcall(struct file *, const char __user *, size_t); | 172 | ssize_t bl_pipe_downcall(struct file *, const char __user *, size_t); |
175 | void bl_pipe_destroy_msg(struct rpc_pipe_msg *); | 173 | void bl_pipe_destroy_msg(struct rpc_pipe_msg *); |
176 | struct block_device *nfs4_blkdev_get(dev_t dev); | 174 | struct block_device *nfs4_blkdev_get(dev_t dev); |
diff --git a/fs/nfs/blocklayout/blocklayoutdev.c b/fs/nfs/blocklayout/blocklayoutdev.c index 0b1fb0e25b9..d08ba9107fd 100644 --- a/fs/nfs/blocklayout/blocklayoutdev.c +++ b/fs/nfs/blocklayout/blocklayoutdev.c | |||
@@ -79,28 +79,6 @@ int nfs4_blkdev_put(struct block_device *bdev) | |||
79 | return blkdev_put(bdev, FMODE_READ); | 79 | return blkdev_put(bdev, FMODE_READ); |
80 | } | 80 | } |
81 | 81 | ||
82 | /* | ||
83 | * Shouldn't there be a rpc_generic_upcall() to do this for us? | ||
84 | */ | ||
85 | ssize_t bl_pipe_upcall(struct file *filp, struct rpc_pipe_msg *msg, | ||
86 | char __user *dst, size_t buflen) | ||
87 | { | ||
88 | char *data = (char *)msg->data + msg->copied; | ||
89 | size_t mlen = min(msg->len - msg->copied, buflen); | ||
90 | unsigned long left; | ||
91 | |||
92 | left = copy_to_user(dst, data, mlen); | ||
93 | if (left == mlen) { | ||
94 | msg->errno = -EFAULT; | ||
95 | return -EFAULT; | ||
96 | } | ||
97 | |||
98 | mlen -= left; | ||
99 | msg->copied += mlen; | ||
100 | msg->errno = 0; | ||
101 | return mlen; | ||
102 | } | ||
103 | |||
104 | static struct bl_dev_msg bl_mount_reply; | 82 | static struct bl_dev_msg bl_mount_reply; |
105 | 83 | ||
106 | ssize_t bl_pipe_downcall(struct file *filp, const char __user *src, | 84 | ssize_t bl_pipe_downcall(struct file *filp, const char __user *src, |