hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nbd: rename the nbd_device variable from lo to nbd 

rename the nbd_device variable from "lo" to "nbd", since "lo" is just a name
copied from loop.c.

Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Cc: Paul Clements <paul.clements@steeleye.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Wanlong Gao 2012-03-28 14:42:51 -07:00 committed by Linus Torvalds
parent cf3f89214e
commit f4507164e7
1 changed files with 148 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

295
drivers/block/nbd.c
View File

@ -39,7 +39,7 @@
#include <linux/nbd.h> #include <linux/nbd.h>
#define LO_MAGIC 0x68797548 #define NBD_MAGIC 0x68797548
#ifdef NDEBUG #ifdef NDEBUG
#define dprintk(flags, fmt...) #define dprintk(flags, fmt...)
@ -116,7 +116,7 @@ static void nbd_end_request(struct request *req)
spin_unlock_irqrestore(q->queue_lock, flags); spin_unlock_irqrestore(q->queue_lock, flags);
} }
static void sock_shutdown(struct nbd_device *lo, int lock) static void sock_shutdown(struct nbd_device *nbd, int lock)
{ {
/* Forcibly shutdown the socket causing all listeners /* Forcibly shutdown the socket causing all listeners
* to error * to error
@ -125,14 +125,14 @@ static void sock_shutdown(struct nbd_device *lo, int lock)
* there should be a more generic interface rather than * there should be a more generic interface rather than
* calling socket ops directly here */ * calling socket ops directly here */
if (lock) if (lock)
mutex_lock(&lo->tx_lock); mutex_lock(&nbd->tx_lock);
if (lo->sock) { if (nbd->sock) {
dev_warn(disk_to_dev(lo->disk), "shutting down socket\n"); dev_warn(disk_to_dev(nbd->disk), "shutting down socket\n");
kernel_sock_shutdown(lo->sock, SHUT_RDWR); kernel_sock_shutdown(nbd->sock, SHUT_RDWR);
lo->sock = NULL; nbd->sock = NULL;
} }
if (lock) if (lock)
mutex_unlock(&lo->tx_lock); mutex_unlock(&nbd->tx_lock);
} }
static void nbd_xmit_timeout(unsigned long arg) static void nbd_xmit_timeout(unsigned long arg)
@ -147,17 +147,17 @@ static void nbd_xmit_timeout(unsigned long arg)
/* /*
* Send or receive packet. * Send or receive packet.
*/ */
static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size, static int sock_xmit(struct nbd_device *nbd, int send, void *buf, int size,
int msg_flags) int msg_flags)
{ {
struct socket *sock = lo->sock; struct socket *sock = nbd->sock;
int result; int result;
struct msghdr msg; struct msghdr msg;
struct kvec iov; struct kvec iov;
sigset_t blocked, oldset; sigset_t blocked, oldset;
if (unlikely(!sock)) { if (unlikely(!sock)) {
dev_err(disk_to_dev(lo->disk), dev_err(disk_to_dev(nbd->disk),
"Attempted %s on closed socket in sock_xmit\n", "Attempted %s on closed socket in sock_xmit\n",
(send ? "send" : "recv")); (send ? "send" : "recv"));
return -EINVAL; return -EINVAL;
@ -181,15 +181,15 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
if (send) { if (send) {
struct timer_list ti; struct timer_list ti;
if (lo->xmit_timeout) { if (nbd->xmit_timeout) {
init_timer(&ti); init_timer(&ti);
ti.function = nbd_xmit_timeout; ti.function = nbd_xmit_timeout;
ti.data = (unsigned long)current; ti.data = (unsigned long)current;
ti.expires = jiffies + lo->xmit_timeout; ti.expires = jiffies + nbd->xmit_timeout;
add_timer(&ti); add_timer(&ti);
} }
result = kernel_sendmsg(sock, &msg, &iov, 1, size); result = kernel_sendmsg(sock, &msg, &iov, 1, size);
if (lo->xmit_timeout) if (nbd->xmit_timeout)
del_timer_sync(&ti); del_timer_sync(&ti);
} else } else
result = kernel_recvmsg(sock, &msg, &iov, 1, size, result = kernel_recvmsg(sock, &msg, &iov, 1, size,
@ -201,7 +201,7 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
task_pid_nr(current), current->comm, task_pid_nr(current), current->comm,
dequeue_signal_lock(current, &current->blocked, &info)); dequeue_signal_lock(current, &current->blocked, &info));
result = -EINTR; result = -EINTR;
sock_shutdown(lo, !send); sock_shutdown(nbd, !send);
break; break;
} }
@ -219,18 +219,19 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
return result; return result;
} }
static inline int sock_send_bvec(struct nbd_device *lo, struct bio_vec *bvec, static inline int sock_send_bvec(struct nbd_device *nbd, struct bio_vec *bvec,
int flags) int flags)
{ {
int result; int result;
void *kaddr = kmap(bvec->bv_page); void *kaddr = kmap(bvec->bv_page);
result = sock_xmit(lo, 1, kaddr + bvec->bv_offset, bvec->bv_len, flags); result = sock_xmit(nbd, 1, kaddr + bvec->bv_offset,
bvec->bv_len, flags);
kunmap(bvec->bv_page); kunmap(bvec->bv_page);
return result; return result;
} }
/* always call with the tx_lock held */ /* always call with the tx_lock held */
static int nbd_send_req(struct nbd_device *lo, struct request *req) static int nbd_send_req(struct nbd_device *nbd, struct request *req)
{ {
int result, flags; int result, flags;
struct nbd_request request; struct nbd_request request;
@ -243,14 +244,14 @@ static int nbd_send_req(struct nbd_device *lo, struct request *req)
memcpy(request.handle, &req, sizeof(req)); memcpy(request.handle, &req, sizeof(req));
dprintk(DBG_TX, "%s: request %p: sending control (%s@%llu,%uB)\n", dprintk(DBG_TX, "%s: request %p: sending control (%s@%llu,%uB)\n",
lo->disk->disk_name, req, nbd->disk->disk_name, req,
nbdcmd_to_ascii(nbd_cmd(req)), nbdcmd_to_ascii(nbd_cmd(req)),
(unsigned long long)blk_rq_pos(req) << 9, (unsigned long long)blk_rq_pos(req) << 9,
blk_rq_bytes(req)); blk_rq_bytes(req));
result = sock_xmit(lo, 1, &request, sizeof(request), result = sock_xmit(nbd, 1, &request, sizeof(request),
(nbd_cmd(req) == NBD_CMD_WRITE) ? MSG_MORE : 0); (nbd_cmd(req) == NBD_CMD_WRITE) ? MSG_MORE : 0);
if (result <= 0) { if (result <= 0) {
dev_err(disk_to_dev(lo->disk), dev_err(disk_to_dev(nbd->disk),
"Send control failed (result %d)\n", result); "Send control failed (result %d)\n", result);
goto error_out; goto error_out;
} }
@ -267,10 +268,10 @@ static int nbd_send_req(struct nbd_device *lo, struct request *req)
if (!rq_iter_last(req, iter)) if (!rq_iter_last(req, iter))
flags = MSG_MORE; flags = MSG_MORE;
dprintk(DBG_TX, "%s: request %p: sending %d bytes data\n", dprintk(DBG_TX, "%s: request %p: sending %d bytes data\n",
lo->disk->disk_name, req, bvec->bv_len); nbd->disk->disk_name, req, bvec->bv_len);
result = sock_send_bvec(lo, bvec, flags); result = sock_send_bvec(nbd, bvec, flags);
if (result <= 0) { if (result <= 0) {
dev_err(disk_to_dev(lo->disk), dev_err(disk_to_dev(nbd->disk),
"Send data failed (result %d)\n", "Send data failed (result %d)\n",
result); result);
goto error_out; goto error_out;
@ -283,25 +284,25 @@ error_out:
return -EIO; return -EIO;
} }
static struct request *nbd_find_request(struct nbd_device *lo, static struct request *nbd_find_request(struct nbd_device *nbd,
struct request *xreq) struct request *xreq)
{ {
struct request *req, *tmp; struct request *req, *tmp;
int err; int err;
err = wait_event_interruptible(lo->active_wq, lo->active_req != xreq); err = wait_event_interruptible(nbd->active_wq, nbd->active_req != xreq);
if (unlikely(err)) if (unlikely(err))
goto out; goto out;
spin_lock(&lo->queue_lock); spin_lock(&nbd->queue_lock);
list_for_each_entry_safe(req, tmp, &lo->queue_head, queuelist) { list_for_each_entry_safe(req, tmp, &nbd->queue_head, queuelist) {
if (req != xreq) if (req != xreq)
continue; continue;
list_del_init(&req->queuelist); list_del_init(&req->queuelist);
spin_unlock(&lo->queue_lock); spin_unlock(&nbd->queue_lock);
return req; return req;
} }
spin_unlock(&lo->queue_lock); spin_unlock(&nbd->queue_lock);
err = -ENOENT; err = -ENOENT;
@ -309,78 +310,78 @@ out:
return ERR_PTR(err); return ERR_PTR(err);
} }
static inline int sock_recv_bvec(struct nbd_device *lo, struct bio_vec *bvec) static inline int sock_recv_bvec(struct nbd_device *nbd, struct bio_vec *bvec)
{ {
int result; int result;
void *kaddr = kmap(bvec->bv_page); void *kaddr = kmap(bvec->bv_page);
result = sock_xmit(lo, 0, kaddr + bvec->bv_offset, bvec->bv_len, result = sock_xmit(nbd, 0, kaddr + bvec->bv_offset, bvec->bv_len,
MSG_WAITALL); MSG_WAITALL);
kunmap(bvec->bv_page); kunmap(bvec->bv_page);
return result; return result;
} }
/* NULL returned = something went wrong, inform userspace */ /* NULL returned = something went wrong, inform userspace */
static struct request *nbd_read_stat(struct nbd_device *lo) static struct request *nbd_read_stat(struct nbd_device *nbd)
{ {
int result; int result;
struct nbd_reply reply; struct nbd_reply reply;
struct request *req; struct request *req;
reply.magic = 0; reply.magic = 0;
result = sock_xmit(lo, 0, &reply, sizeof(reply), MSG_WAITALL); result = sock_xmit(nbd, 0, &reply, sizeof(reply), MSG_WAITALL);
if (result <= 0) { if (result <= 0) {
dev_err(disk_to_dev(lo->disk), dev_err(disk_to_dev(nbd->disk),
"Receive control failed (result %d)\n", result); "Receive control failed (result %d)\n", result);
goto harderror; goto harderror;
} }
if (ntohl(reply.magic) != NBD_REPLY_MAGIC) { if (ntohl(reply.magic) != NBD_REPLY_MAGIC) {
dev_err(disk_to_dev(lo->disk), "Wrong magic (0x%lx)\n", dev_err(disk_to_dev(nbd->disk), "Wrong magic (0x%lx)\n",
(unsigned long)ntohl(reply.magic)); (unsigned long)ntohl(reply.magic));
result = -EPROTO; result = -EPROTO;
goto harderror; goto harderror;
} }
req = nbd_find_request(lo, *(struct request **)reply.handle); req = nbd_find_request(nbd, *(struct request **)reply.handle);
if (IS_ERR(req)) { if (IS_ERR(req)) {
result = PTR_ERR(req); result = PTR_ERR(req);
if (result != -ENOENT) if (result != -ENOENT)
goto harderror; goto harderror;
dev_err(disk_to_dev(lo->disk), "Unexpected reply (%p)\n", dev_err(disk_to_dev(nbd->disk), "Unexpected reply (%p)\n",
reply.handle); reply.handle);
result = -EBADR; result = -EBADR;
goto harderror; goto harderror;
} }
if (ntohl(reply.error)) { if (ntohl(reply.error)) {
dev_err(disk_to_dev(lo->disk), "Other side returned error (%d)\n", dev_err(disk_to_dev(nbd->disk), "Other side returned error (%d)\n",
ntohl(reply.error)); ntohl(reply.error));
req->errors++; req->errors++;
return req; return req;
} }
dprintk(DBG_RX, "%s: request %p: got reply\n", dprintk(DBG_RX, "%s: request %p: got reply\n",
lo->disk->disk_name, req); nbd->disk->disk_name, req);
if (nbd_cmd(req) == NBD_CMD_READ) { if (nbd_cmd(req) == NBD_CMD_READ) {
struct req_iterator iter; struct req_iterator iter;
struct bio_vec *bvec; struct bio_vec *bvec;
rq_for_each_segment(bvec, req, iter) { rq_for_each_segment(bvec, req, iter) {
result = sock_recv_bvec(lo, bvec); result = sock_recv_bvec(nbd, bvec);
if (result <= 0) { if (result <= 0) {
dev_err(disk_to_dev(lo->disk), "Receive data failed (result %d)\n", dev_err(disk_to_dev(nbd->disk), "Receive data failed (result %d)\n",
result); result);
req->errors++; req->errors++;
return req; return req;
} }
dprintk(DBG_RX, "%s: request %p: got %d bytes data\n", dprintk(DBG_RX, "%s: request %p: got %d bytes data\n",
lo->disk->disk_name, req, bvec->bv_len); nbd->disk->disk_name, req, bvec->bv_len);
} }
} }
return req; return req;
harderror: harderror:
lo->harderror = result; nbd->harderror = result;
return NULL; return NULL;
} }
@ -398,48 +399,48 @@ static struct device_attribute pid_attr = {
.show = pid_show, .show = pid_show,
}; };
static int nbd_do_it(struct nbd_device *lo) static int nbd_do_it(struct nbd_device *nbd)
{ {
struct request *req; struct request *req;
int ret; int ret;
BUG_ON(lo->magic != LO_MAGIC); BUG_ON(nbd->magic != NBD_MAGIC);
lo->pid = task_pid_nr(current); nbd->pid = task_pid_nr(current);
ret = device_create_file(disk_to_dev(lo->disk), &pid_attr); ret = device_create_file(disk_to_dev(nbd->disk), &pid_attr);
if (ret) { if (ret) {
dev_err(disk_to_dev(lo->disk), "device_create_file failed!\n"); dev_err(disk_to_dev(nbd->disk), "device_create_file failed!\n");
lo->pid = 0; nbd->pid = 0;
return ret; return ret;
} }
while ((req = nbd_read_stat(lo)) != NULL) while ((req = nbd_read_stat(nbd)) != NULL)
nbd_end_request(req); nbd_end_request(req);
device_remove_file(disk_to_dev(lo->disk), &pid_attr); device_remove_file(disk_to_dev(nbd->disk), &pid_attr);
lo->pid = 0; nbd->pid = 0;
return 0; return 0;
} }
static void nbd_clear_que(struct nbd_device *lo) static void nbd_clear_que(struct nbd_device *nbd)
{ {
struct request *req; struct request *req;
BUG_ON(lo->magic != LO_MAGIC); BUG_ON(nbd->magic != NBD_MAGIC);
/* /*
* Because we have set lo->sock to NULL under the tx_lock, all * Because we have set nbd->sock to NULL under the tx_lock, all
* modifications to the list must have completed by now. For * modifications to the list must have completed by now. For
* the same reason, the active_req must be NULL. * the same reason, the active_req must be NULL.
* *
* As a consequence, we don't need to take the spin lock while * As a consequence, we don't need to take the spin lock while
* purging the list here. * purging the list here.
*/ */
BUG_ON(lo->sock); BUG_ON(nbd->sock);
BUG_ON(lo->active_req); BUG_ON(nbd->active_req);
while (!list_empty(&lo->queue_head)) { while (!list_empty(&nbd->queue_head)) {
req = list_entry(lo->queue_head.next, struct request, req = list_entry(nbd->queue_head.next, struct request,
queuelist); queuelist);
list_del_init(&req->queuelist); list_del_init(&req->queuelist);
req->errors++; req->errors++;
@ -448,7 +449,7 @@ static void nbd_clear_que(struct nbd_device *lo)
} }
static void nbd_handle_req(struct nbd_device *lo, struct request *req) static void nbd_handle_req(struct nbd_device *nbd, struct request *req)
{ {
if (req->cmd_type != REQ_TYPE_FS) if (req->cmd_type != REQ_TYPE_FS)
goto error_out; goto error_out;
@ -456,8 +457,8 @@ static void nbd_handle_req(struct nbd_device *lo, struct request *req)
nbd_cmd(req) = NBD_CMD_READ; nbd_cmd(req) = NBD_CMD_READ;
if (rq_data_dir(req) == WRITE) { if (rq_data_dir(req) == WRITE) {
nbd_cmd(req) = NBD_CMD_WRITE; nbd_cmd(req) = NBD_CMD_WRITE;
if (lo->flags & NBD_READ_ONLY) { if (nbd->flags & NBD_READ_ONLY) {
dev_err(disk_to_dev(lo->disk), dev_err(disk_to_dev(nbd->disk),
"Write on read-only\n"); "Write on read-only\n");
goto error_out; goto error_out;
} }
@ -465,29 +466,29 @@ static void nbd_handle_req(struct nbd_device *lo, struct request *req)
req->errors = 0; req->errors = 0;
mutex_lock(&lo->tx_lock); mutex_lock(&nbd->tx_lock);
if (unlikely(!lo->sock)) { if (unlikely(!nbd->sock)) {
mutex_unlock(&lo->tx_lock); mutex_unlock(&nbd->tx_lock);
dev_err(disk_to_dev(lo->disk), dev_err(disk_to_dev(nbd->disk),
"Attempted send on closed socket\n"); "Attempted send on closed socket\n");
goto error_out; goto error_out;
} }
lo->active_req = req; nbd->active_req = req;
if (nbd_send_req(lo, req) != 0) { if (nbd_send_req(nbd, req) != 0) {
dev_err(disk_to_dev(lo->disk), "Request send failed\n"); dev_err(disk_to_dev(nbd->disk), "Request send failed\n");
req->errors++; req->errors++;
nbd_end_request(req); nbd_end_request(req);
} else { } else {
spin_lock(&lo->queue_lock); spin_lock(&nbd->queue_lock);
list_add(&req->queuelist, &lo->queue_head); list_add(&req->queuelist, &nbd->queue_head);
spin_unlock(&lo->queue_lock); spin_unlock(&nbd->queue_lock);
} }
lo->active_req = NULL; nbd->active_req = NULL;
mutex_unlock(&lo->tx_lock); mutex_unlock(&nbd->tx_lock);
wake_up_all(&lo->active_wq); wake_up_all(&nbd->active_wq);
return; return;
@ -498,28 +499,28 @@ error_out:
static int nbd_thread(void *data) static int nbd_thread(void *data)
{ {
struct nbd_device *lo = data; struct nbd_device *nbd = data;
struct request *req; struct request *req;
set_user_nice(current, -20); set_user_nice(current, -20);
while (!kthread_should_stop() || !list_empty(&lo->waiting_queue)) { while (!kthread_should_stop() || !list_empty(&nbd->waiting_queue)) {
/* wait for something to do */ /* wait for something to do */
wait_event_interruptible(lo->waiting_wq, wait_event_interruptible(nbd->waiting_wq,
kthread_should_stop() || kthread_should_stop() ||
!list_empty(&lo->waiting_queue)); !list_empty(&nbd->waiting_queue));
/* extract request */ /* extract request */
if (list_empty(&lo->waiting_queue)) if (list_empty(&nbd->waiting_queue))
continue; continue;
spin_lock_irq(&lo->queue_lock); spin_lock_irq(&nbd->queue_lock);
req = list_entry(lo->waiting_queue.next, struct request, req = list_entry(nbd->waiting_queue.next, struct request,
queuelist); queuelist);
list_del_init(&req->queuelist); list_del_init(&req->queuelist);
spin_unlock_irq(&lo->queue_lock); spin_unlock_irq(&nbd->queue_lock);
/* handle request */ /* handle request */
nbd_handle_req(lo, req); nbd_handle_req(nbd, req);
} }
return 0; return 0;
} }
@ -527,7 +528,7 @@ static int nbd_thread(void *data)
/* /*
* We always wait for result of write, for now. It would be nice to make it optional * We always wait for result of write, for now. It would be nice to make it optional
* in future * in future
* if ((rq_data_dir(req) == WRITE) && (lo->flags & NBD_WRITE_NOCHK)) * if ((rq_data_dir(req) == WRITE) && (nbd->flags & NBD_WRITE_NOCHK))
* { printk( "Warning: Ignoring result!\n"); nbd_end_request( req ); } * { printk( "Warning: Ignoring result!\n"); nbd_end_request( req ); }
*/ */
@ -536,19 +537,19 @@ static void do_nbd_request(struct request_queue *q)
struct request *req; struct request *req;
while ((req = blk_fetch_request(q)) != NULL) { while ((req = blk_fetch_request(q)) != NULL) {
struct nbd_device *lo; struct nbd_device *nbd;
spin_unlock_irq(q->queue_lock); spin_unlock_irq(q->queue_lock);
dprintk(DBG_BLKDEV, "%s: request %p: dequeued (flags=%x)\n", dprintk(DBG_BLKDEV, "%s: request %p: dequeued (flags=%x)\n",
req->rq_disk->disk_name, req, req->cmd_type); req->rq_disk->disk_name, req, req->cmd_type);
lo = req->rq_disk->private_data; nbd = req->rq_disk->private_data;
BUG_ON(lo->magic != LO_MAGIC); BUG_ON(nbd->magic != NBD_MAGIC);
if (unlikely(!lo->sock)) { if (unlikely(!nbd->sock)) {
dev_err(disk_to_dev(lo->disk), dev_err(disk_to_dev(nbd->disk),
"Attempted send on closed socket\n"); "Attempted send on closed socket\n");
req->errors++; req->errors++;
nbd_end_request(req); nbd_end_request(req);
@ -556,11 +557,11 @@ static void do_nbd_request(struct request_queue *q)
continue; continue;
} }
spin_lock_irq(&lo->queue_lock); spin_lock_irq(&nbd->queue_lock);
list_add_tail(&req->queuelist, &lo->waiting_queue); list_add_tail(&req->queuelist, &nbd->waiting_queue);
spin_unlock_irq(&lo->queue_lock); spin_unlock_irq(&nbd->queue_lock);
wake_up(&lo->waiting_wq); wake_up(&nbd->waiting_wq);
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);
} }
@ -568,32 +569,32 @@ static void do_nbd_request(struct request_queue *q)
/* Must be called with tx_lock held */ /* Must be called with tx_lock held */
static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo, static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
switch (cmd) { switch (cmd) {
case NBD_DISCONNECT: { case NBD_DISCONNECT: {
struct request sreq; struct request sreq;
dev_info(disk_to_dev(lo->disk), "NBD_DISCONNECT\n"); dev_info(disk_to_dev(nbd->disk), "NBD_DISCONNECT\n");
blk_rq_init(NULL, &sreq); blk_rq_init(NULL, &sreq);
sreq.cmd_type = REQ_TYPE_SPECIAL; sreq.cmd_type = REQ_TYPE_SPECIAL;
nbd_cmd(&sreq) = NBD_CMD_DISC; nbd_cmd(&sreq) = NBD_CMD_DISC;
if (!lo->sock) if (!nbd->sock)
return -EINVAL; return -EINVAL;
nbd_send_req(lo, &sreq); nbd_send_req(nbd, &sreq);
return 0; return 0;
} }
case NBD_CLEAR_SOCK: { case NBD_CLEAR_SOCK: {
struct file *file; struct file *file;
lo->sock = NULL; nbd->sock = NULL;
file = lo->file; file = nbd->file;
lo->file = NULL; nbd->file = NULL;
nbd_clear_que(lo); nbd_clear_que(nbd);
BUG_ON(!list_empty(&lo->queue_head)); BUG_ON(!list_empty(&nbd->queue_head));
if (file) if (file)
fput(file); fput(file);
return 0; return 0;
@ -601,14 +602,14 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
case NBD_SET_SOCK: { case NBD_SET_SOCK: {
struct file *file; struct file *file;
if (lo->file) if (nbd->file)
return -EBUSY; return -EBUSY;
file = fget(arg); file = fget(arg);
if (file) { if (file) {
struct inode *inode = file->f_path.dentry->d_inode; struct inode *inode = file->f_path.dentry->d_inode;
if (S_ISSOCK(inode->i_mode)) { if (S_ISSOCK(inode->i_mode)) {
lo->file = file; nbd->file = file;
lo->sock = SOCKET_I(inode); nbd->sock = SOCKET_I(inode);
if (max_part > 0) if (max_part > 0)
bdev->bd_invalidated = 1; bdev->bd_invalidated = 1;
return 0; return 0;
@ -620,29 +621,29 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
} }
case NBD_SET_BLKSIZE: case NBD_SET_BLKSIZE:
lo->blksize = arg; nbd->blksize = arg;
lo->bytesize &= ~(lo->blksize-1); nbd->bytesize &= ~(nbd->blksize-1);
bdev->bd_inode->i_size = lo->bytesize; bdev->bd_inode->i_size = nbd->bytesize;
set_blocksize(bdev, lo->blksize); set_blocksize(bdev, nbd->blksize);
set_capacity(lo->disk, lo->bytesize >> 9); set_capacity(nbd->disk, nbd->bytesize >> 9);
return 0; return 0;
case NBD_SET_SIZE: case NBD_SET_SIZE:
lo->bytesize = arg & ~(lo->blksize-1); nbd->bytesize = arg & ~(nbd->blksize-1);
bdev->bd_inode->i_size = lo->bytesize; bdev->bd_inode->i_size = nbd->bytesize;
set_blocksize(bdev, lo->blksize); set_blocksize(bdev, nbd->blksize);
set_capacity(lo->disk, lo->bytesize >> 9); set_capacity(nbd->disk, nbd->bytesize >> 9);
return 0; return 0;
case NBD_SET_TIMEOUT: case NBD_SET_TIMEOUT:
lo->xmit_timeout = arg * HZ; nbd->xmit_timeout = arg * HZ;
return 0; return 0;
case NBD_SET_SIZE_BLOCKS: case NBD_SET_SIZE_BLOCKS:
lo->bytesize = ((u64) arg) * lo->blksize; nbd->bytesize = ((u64) arg) * nbd->blksize;
bdev->bd_inode->i_size = lo->bytesize; bdev->bd_inode->i_size = nbd->bytesize;
set_blocksize(bdev, lo->blksize); set_blocksize(bdev, nbd->blksize);
set_capacity(lo->disk, lo->bytesize >> 9); set_capacity(nbd->disk, nbd->bytesize >> 9);
return 0; return 0;
case NBD_DO_IT: { case NBD_DO_IT: {
@ -650,38 +651,38 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
struct file *file; struct file *file;
int error; int error;
if (lo->pid) if (nbd->pid)
return -EBUSY; return -EBUSY;
if (!lo->file) if (!nbd->file)
return -EINVAL; return -EINVAL;
mutex_unlock(&lo->tx_lock); mutex_unlock(&nbd->tx_lock);
thread = kthread_create(nbd_thread, lo, lo->disk->disk_name); thread = kthread_create(nbd_thread, nbd, nbd->disk->disk_name);
if (IS_ERR(thread)) { if (IS_ERR(thread)) {
mutex_lock(&lo->tx_lock); mutex_lock(&nbd->tx_lock);
return PTR_ERR(thread); return PTR_ERR(thread);
} }
wake_up_process(thread); wake_up_process(thread);
error = nbd_do_it(lo); error = nbd_do_it(nbd);
kthread_stop(thread); kthread_stop(thread);
mutex_lock(&lo->tx_lock); mutex_lock(&nbd->tx_lock);
if (error) if (error)
return error; return error;
sock_shutdown(lo, 0); sock_shutdown(nbd, 0);
file = lo->file; file = nbd->file;
lo->file = NULL; nbd->file = NULL;
nbd_clear_que(lo); nbd_clear_que(nbd);
dev_warn(disk_to_dev(lo->disk), "queue cleared\n"); dev_warn(disk_to_dev(nbd->disk), "queue cleared\n");
if (file) if (file)
fput(file); fput(file);
lo->bytesize = 0; nbd->bytesize = 0;
bdev->bd_inode->i_size = 0; bdev->bd_inode->i_size = 0;
set_capacity(lo->disk, 0); set_capacity(nbd->disk, 0);
if (max_part > 0) if (max_part > 0)
ioctl_by_bdev(bdev, BLKRRPART, 0); ioctl_by_bdev(bdev, BLKRRPART, 0);
return lo->harderror; return nbd->harderror;
} }
case NBD_CLEAR_QUE: case NBD_CLEAR_QUE:
@ -689,14 +690,14 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
* This is for compatibility only. The queue is always cleared * This is for compatibility only. The queue is always cleared
* by NBD_DO_IT or NBD_CLEAR_SOCK. * by NBD_DO_IT or NBD_CLEAR_SOCK.
*/ */
BUG_ON(!lo->sock && !list_empty(&lo->queue_head)); BUG_ON(!nbd->sock && !list_empty(&nbd->queue_head));
return 0; return 0;
case NBD_PRINT_DEBUG: case NBD_PRINT_DEBUG:
dev_info(disk_to_dev(lo->disk), dev_info(disk_to_dev(nbd->disk),
"next = %p, prev = %p, head = %p\n", "next = %p, prev = %p, head = %p\n",
lo->queue_head.next, lo->queue_head.prev, nbd->queue_head.next, nbd->queue_head.prev,
&lo->queue_head); &nbd->queue_head);
return 0; return 0;
} }
return -ENOTTY; return -ENOTTY;
@ -705,21 +706,21 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
static int nbd_ioctl(struct block_device *bdev, fmode_t mode, static int nbd_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
struct nbd_device *lo = bdev->bd_disk->private_data; struct nbd_device *nbd = bdev->bd_disk->private_data;
int error; int error;
if (!capable(CAP_SYS_ADMIN)) if (!capable(CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
BUG_ON(lo->magic != LO_MAGIC); BUG_ON(nbd->magic != NBD_MAGIC);
/* Anyone capable of this syscall can do *real bad* things */ /* Anyone capable of this syscall can do *real bad* things */
dprintk(DBG_IOCTL, "%s: nbd_ioctl cmd=%s(0x%x) arg=%lu\n", dprintk(DBG_IOCTL, "%s: nbd_ioctl cmd=%s(0x%x) arg=%lu\n",
lo->disk->disk_name, ioctl_cmd_to_ascii(cmd), cmd, arg); nbd->disk->disk_name, ioctl_cmd_to_ascii(cmd), cmd, arg);
mutex_lock(&lo->tx_lock); mutex_lock(&nbd->tx_lock);
error = __nbd_ioctl(bdev, lo, cmd, arg); error = __nbd_ioctl(bdev, nbd, cmd, arg);
mutex_unlock(&lo->tx_lock); mutex_unlock(&nbd->tx_lock);
return error; return error;
} }
@ -805,7 +806,7 @@ static int __init nbd_init(void)
for (i = 0; i < nbds_max; i++) { for (i = 0; i < nbds_max; i++) {
struct gendisk *disk = nbd_dev[i].disk; struct gendisk *disk = nbd_dev[i].disk;
nbd_dev[i].file = NULL; nbd_dev[i].file = NULL;
nbd_dev[i].magic = LO_MAGIC; nbd_dev[i].magic = NBD_MAGIC;
nbd_dev[i].flags = 0; nbd_dev[i].flags = 0;
INIT_LIST_HEAD(&nbd_dev[i].waiting_queue); INIT_LIST_HEAD(&nbd_dev[i].waiting_queue);
spin_lock_init(&nbd_dev[i].queue_lock); spin_lock_init(&nbd_dev[i].queue_lock);