IB/hfi1: checking for NULL instead of IS_ERR
Subsystems (3)
PATCH 1/1 IB/hfi1: checking for NULL instead of IS_ERR
__get_txreq() returns an ERR_PTR() but this checks for NULL so it would oops on failure.
drivers/staging/rdma/hfi1/verbs.c +5 -3
@@ -749,11 +749,13 @@ static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev,struct verbs_txreq *tx; tx =kmem_cache_alloc (dev->verbs_txreq_cache,GFP_ATOMIC ); -if (!tx) +if (!tx) {/* call slow path to get the lock */ tx =__get_txreq (dev, qp); -if (tx) - tx->qp = qp; +if (IS_ERR (tx)) +return tx; + } + tx->qp = qp;return tx; }
Doug Ledford
AppliedQuoted 4 lines · Dan Carpenter
__get_txreq()returns anERR_PTR()but this checks for NULL so it would oops on failure.Signed-off-by Dan Carpenter <[email protected]>
Thanks, applied.
Signature · 2 lines
Doug Ledford <[email protected]> GPG KeyID: 0E572FDD
Quoted 7 lines · Doug Ledford
Quoted 4 lines · Dan Carpenter
__get_txreq()returns anERR_PTR()but this checks for NULL so it would oops on failure.Signed-off-by Dan Carpenter <[email protected]>Thanks, applied.
Applied to what? Should I just ignore these types of patches and not take them in my tree and you will send them on later on? I don't remember what we agreed to do, sorry.
thanks,
greg k-h
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 6 lines · Doug Ledford
Quoted 4 lines · Dan Carpenter
Quoted 3 lines
__get_txreq()returns anERR_PTR()but this checks for NULL so it would oops on failure.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Dan Carpenter <[email protected]>Thanks, applied.
Applied to what? Should I just ignore these types of patches and not take them in my tree and you will send them on later on? I don't remember what we agreed to do, sorry.
My recollection was that Doug was going to handle the staging/rdma sub-tree because of the large churn he expected between the rdma subsystem and those drivers.
Therefore, I have been submitting my patches against staging/rdma/hfi directly to Doug and Linux-rdma.
Ira
Quoted 8 lines
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 2807E5FD2F6FDA4886F6618EAC48510E1CB98D06-8k97q/[email protected]
Greg Kroah-Hartman
maintainerQuoted 10 lines · Ira
Quoted 10 lines · Doug Ledford
Quoted 7 lines · Dan Carpenter
Quoted 4 lines
__get_txreq()returns anERR_PTR()but this checks for NULL so it would oops on failure.Signed-off-by Dan Carpenter <[email protected]>Thanks, applied.
Quoted 7 lines
Quoted 3 lines
Applied to what? Should I just ignore these types of patches and not take them in my tree and you will send them on later on? I don't remember what we agreed to do, sorry.
My recollection was that Doug was going to handle the staging/rdma sub-tree because of the large churn he expected between the rdma subsystem and those drivers.
Therefore, I have been submitting my patches against staging/rdma/hfi directly to Doug and Linux-rdma.
Ok, but Doug better start syncing up with me soon, as we are about to start to get a ton of staging patches due to the Outreachy application process, and we will start to get merge errors very quickly.
Doug, what's the plan for this? Can you just forward me patches every so often to sync up? Or I can take anything that is cc: me and/or the driverdevel mailing list.
thanks,
greg k-h
Quoted 5 lines · Greg Kroah-Hartman
Quoted 4 lines · Doug Ledford
Quoted 3 lines · Dan Carpenter
__get_txreq()returns anERR_PTR()but this checks for NULL so it would oops on failure.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Dan Carpenter <[email protected]>Thanks, applied.
Applied to what? Should I just ignore these types of patches and not take them in my tree and you will send them on later on? I don't remember what we agreed to do, sorry.
My understanding was that I would handle everything in the staging/rdma area. To that end, I tried to make it explicit so that people would know that via the following things:
From MAINTAINERS:
INFINIBAND SUBSYSTEM
M: Doug Ledford <[email protected]> M: Sean Hefty <[email protected]> M: Hal Rosenstock <[email protected]> L: [email protected] W: http://www.openfabrics.org/ Q: http://patchwork.kernel.org/project/linux-rdma/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git S: Supported F: Documentation/infiniband/ F: drivers/infiniband/ F: drivers/staging/rdma/ F: include/uapi/linux/if_infiniband.h F: include/uapi/rdma/ F: include/rdma/
And from drivers/staging/rdma/Kconfig:
menuconfig STAGING_RDMA
bool "RDMA staging drivers"
depends on INFINIBAND
depends on PCI || BROKEN
depends on HAS_IOMEM
depends on NET
depends on INET
default n
---help---
This option allows you to select a number of RDMA drivers that fall into one of two categories: deprecated drivers being held here before finally being removed or new drivers that still need some work before being moved to the normal RDMA driver area.
If you wish to work on these drivers, to help improve them, or to report problems you have with them, please use the [email protected] mailing list.
If in doubt, say N here.
I was hoping those two items would be sufficient to keep people from flooding devel@ and yourself personally with fixups for these items and instead they would send them through linux-rdma@.
Signature · 2 lines
Doug Ledford <[email protected]> GPG KeyID: 0E572FDD
Greg Kroah-Hartman
maintainerQuoted 57 lines · Doug Ledford
Quoted 5 lines · Greg Kroah-Hartman
Quoted 4 lines · Doug Ledford
Quoted 3 lines · Dan Carpenter
__get_txreq()returns anERR_PTR()but this checks for NULL so it would oops on failure.Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Dan Carpenter <[email protected]>Thanks, applied.
Applied to what? Should I just ignore these types of patches and not take them in my tree and you will send them on later on? I don't remember what we agreed to do, sorry.
My understanding was that I would handle everything in the staging/rdma area. To that end, I tried to make it explicit so that people would know that via the following things:
From
MAINTAINERS:INFINIBAND SUBSYSTEM
M: Doug Ledford <[email protected]> M: Sean Hefty <[email protected]> M: Hal Rosenstock <[email protected]> L: [email protected] W: http://www.openfabrics.org/ Q: http://patchwork.kernel.org/project/linux-rdma/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git S: Supported F: Documentation/infiniband/ F: drivers/infiniband/ F: drivers/staging/rdma/ F: include/uapi/linux/if_infiniband.h F: include/uapi/rdma/ F: include/rdma/And from
drivers/staging/rdma/Kconfig:menuconfig
STAGING_RDMA
bool "RDMA staging drivers"
depends on INFINIBAND
depends on PCI || BROKEN
depends onHAS_IOMEM
depends on NET
depends on INET
default n
---help---
This option allows you to select a number of RDMA drivers that fall into one of two categories: deprecated drivers being held here before finally being removed or new drivers that still need some work before being moved to the normal RDMA driver area.If you wish to work on these drivers, to help improve them, or to report problems you have with them, please use the [email protected] mailing list.
Quoted 5 lines
If in doubt, say N here.
I was hoping those two items would be sufficient to keep people from flooding devel@ and yourself personally with fixups for these items and instead they would send them through linux-rdma@.
But, that's already not happening, as is obvious by my inbox.
So, how about you forward on what you have so far to me, and I'll keep these. Otherwise you will end up with nasty merge issues very quickly as people will continue to send stuff to me.
thanks,
greg k-h
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 1 line · Greg Kroah-Hartman
But, that's already not happening, as is obvious by my inbox.
Yeah, I see that.
Quoted 3 lines
So, how about you forward on what you have so far to me, and I'll keep these. Otherwise you will end up with nasty merge issues very quickly as people will continue to send stuff to me.
As you wish. I pulled in a number of patches related to hfi1, but I've already sent the pull request to Linus and they made it as of 4.1-rc2. So, just start from there and you will have all the patches I've taken.
Signature · 2 lines
Doug Ledford <[email protected]> GPG KeyID: 0E572FDD
A message that is not in the archive (sent off-list or not yet received): [email protected]
Greg Kroah-Hartman
maintainerQuoted 6 lines · Doug Ledford
Quoted 1 line · Greg Kroah-Hartman
But, that's already not happening, as is obvious by my inbox.
Yeah, I see that.
Quoted 7 lines
Quoted 3 lines
So, how about you forward on what you have so far to me, and I'll keep these. Otherwise you will end up with nasty merge issues very quickly as people will continue to send stuff to me.
As you wish. I pulled in a number of patches related to hfi1, but I've already sent the pull request to Linus and they made it as of 4.1-rc2. So, just start from there and you will have all the patches I've taken.
Sounds good, thanks.
greg k-h
PATCH 1/1 maintainers: update staging/rdma
Doug Ledford will be handling all the patches related to drivers/staging/rdma/. Patches for those files are not to be sent to Greg and devel mailing list.
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -9877,6 +9877,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git L: [email protected] S: Supported F: drivers/staging/ +X: drivers/staging/rdma STAGING - COMEDI M: Ian Abbott <[email protected]>
Signature · 1 line
1.9.1
Greg KH
maintainerRe: [PATCH] maintainers: update staging/rdma
Quoted 14 lines · Sudip Mukherjee
Doug Ledford will be handling all the patches related to
drivers/staging/rdma/. Patches for those files are not to be sent to Greg and devel mailing list.Signed-off-by Sudip Mukherjee <[email protected]>--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)MAINTAINERS +0
-0
MAINTAINERS T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git · line 9880
Quoted 4 lines
MAINTAINERS +1
-0@@ -9877,6 +9877,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git L: [email protected] S: Supported F: drivers/staging/ +X: drivers/staging/rdma
Nope, sorry, I'm taking them :)