mshv_eventfd: convert to CLASS(fd)
Subsystems (3)
Al Viro
maintainerPATCH 1/1 mshv_eventfd: convert to CLASS(fd)
[in viro/vfs.git #work.fd; if nobody objects, into #for-next it goes...]
similar to 66635b077624 ("assorted variants of irqfd setup: convert to CLASS(fd)") a year ago...
Signed-off-by Al Viro <[email protected]>
---
drivers/hv/mshv_eventfd.c +3 -11
@@ -377,10 +377,11 @@ static int mshv_irqfd_assign(struct mshv_partition *pt,struct eventfd_ctx *eventfd =NULL , *resamplefd =NULL ;struct mshv_irqfd *irqfd, *tmp;unsigned int events; -struct fd f;int ret;int idx; +CLASS (fd, f)(args->fd); + irqfd =kzalloc (sizeof (*irqfd),GFP_KERNEL );if (!irqfd)return -ENOMEM ;
@@ -390,8 +391,7 @@ static int mshv_irqfd_assign(struct mshv_partition *pt,INIT_WORK (&irqfd->irqfd_shutdown, mshv_irqfd_shutdown);seqcount_spinlock_init (&irqfd->irqfd_irqe_sc, &pt->pt_irqfds_lock); - f =fdget (args->fd); -if (!fd_file (f)) { +if (fd_empty (f)) { ret = -EBADF ; goto out; }
@@ -496,12 +496,6 @@ static int mshv_irqfd_assign(struct mshv_partition *pt,mshv_assert_irq_slow (irqfd);srcu_read_unlock (&pt->pt_irq_srcu, idx); -/* -* do not drop the file until the irqfd is fully initialized, otherwise -* we might race against the POLLHUP -*/ -fdput (f); -return 0 ; fail:
@@ -514,8 +508,6 @@ static int mshv_irqfd_assign(struct mshv_partition *pt,if (eventfd && !IS_ERR (eventfd))eventfd_ctx_put (eventfd); -fdput (f); - out:kfree (irqfd);return ret;
Quoted 6 lines · Al Viro
[in viro/vfs.git #work.fd; if nobody objects, into #for-next it goes...]
similar to
66635b077624("assorted variants of irqfd setup: convert to CLASS(fd)") a year ago...Signed-off-by Al Viro <[email protected]>
Thanks for the patch, Al.
Acked-by Wei Liu <[email protected]>
Quoted 48 lines · Al Viro
[in viro/vfs.git #work.fd; if nobody objects, into #for-next it goes...]
similar to
66635b077624("assorted variants of irqfd setup: convert to CLASS(fd)") a year ago...Signed-off-by Al Viro <[email protected]>---
drivers/hv/mshv_eventfd.c +3
-9@@ -377,10 +377,11 @@ static int mshv_irqfd_assign(struct mshv_partition *pt,struct eventfd_ctx *eventfd =NULL , *resamplefd =NULL ;struct mshv_irqfd *irqfd, *tmp;unsigned int events; -struct fd f;int ret;int idx; +CLASS (fd, f)(args->fd); + irqfd =kzalloc (sizeof (*irqfd),GFP_KERNEL );if (!irqfd)return -ENOMEM ;@@ -390,8 +391,7 @@ static int mshv_irqfd_assign(struct mshv_partition *pt,INIT_WORK (&irqfd->irqfd_shutdown, mshv_irqfd_shutdown);seqcount_spinlock_init (&irqfd->irqfd_irqe_sc, &pt->pt_irqfds_lock); - f =fdget (args->fd); -if (!fd_file (f)) { +if (fd_empty (f)) { ret = -EBADF ; goto out; }@@ -496,12 +496,6 @@ static int mshv_irqfd_assign(struct mshv_partition *pt,mshv_assert_irq_slow (irqfd);srcu_read_unlock (&pt->pt_irq_srcu, idx); -/* -* do not drop the file until the irqfd is fully initialized, otherwise -* we might race against the POLLHUP -*/ -fdput (f); -return 0 ; fail:
drivers/hv/mshv_eventfd.c static int mshv_irqfd_assign(struct mshv_partition *pt, · line 513
Quoted 8 lines
drivers/hv/mshv_eventfd.c +0
-2@@ -514,8 +508,6 @@ static int mshv_irqfd_assign(struct mshv_partition *pt,if (eventfd && !IS_ERR (eventfd))eventfd_ctx_put (eventfd); -fdput (f); - out:kfree (irqfd);return ret;
Looks fine to me, thanks.
Reviewed-by Nuno Das Neves <[email protected]>