[Nbd] [PATCH v2 5/5]nbd: use device_attr macros for sysfs attribute
- To: mpa@...1897..., nbd-general@lists.sourceforge.net, linux-kernel@...25...
- Cc: "Pranay Kr. Srivastava" <pranjas@...17...>
- Subject: [Nbd] [PATCH v2 5/5]nbd: use device_attr macros for sysfs attribute
- From: "Pranay Kr. Srivastava" <pranjas@...17...>
- Date: Thu, 2 Jun 2016 13:25:01 +0300
- Message-id: <1464863101-16805-6-git-send-email-pranjas@...17...>
- In-reply-to: <1464863101-16805-1-git-send-email-pranjas@...17...>
- References: <3898019.JRqDjBPssX@...2153...> <1464863101-16805-1-git-send-email-pranjas@...17...>
This patch changes the pid sysfs device attribute to use
DEVICE_ATTR_* macro.
Signed-off-by: Pranay Kr. Srivastava <pranjas@...17...>
---
drivers/block/nbd.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 4da40dc..323ab26 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -449,10 +449,8 @@ static ssize_t pid_show(struct device *dev,
return sprintf(buf, "%d\n", task_pid_nr(nbd->task_recv));
}
-static struct device_attribute pid_attr = {
- .attr = { .name = "pid", .mode = S_IRUGO},
- .show = pid_show,
-};
+
+static DEVICE_ATTR_RO(pid);
static int nbd_thread_recv(struct nbd_device *nbd, struct block_device *bdev)
{
@@ -465,7 +463,7 @@ static int nbd_thread_recv(struct nbd_device *nbd, struct block_device *bdev)
nbd->task_recv = current;
- ret = device_create_file(disk_to_dev(nbd->disk), &pid_attr);
+ ret = device_create_file(disk_to_dev(nbd->disk), &dev_attr_pid);
if (ret) {
dev_err(disk_to_dev(nbd->disk), "device_create_file failed!\n");
@@ -488,7 +486,7 @@ static int nbd_thread_recv(struct nbd_device *nbd, struct block_device *bdev)
nbd_size_clear(nbd, bdev);
- device_remove_file(disk_to_dev(nbd->disk), &pid_attr);
+ device_remove_file(disk_to_dev(nbd->disk), &dev_attr_pid);
nbd->task_recv = NULL;
--
2.6.2
Reply to: