Skip to content

Commit

Permalink
[SCSI] fcoe: fix incorrect use of struct module
Browse files Browse the repository at this point in the history
This structure may not be defined if CONFIG_MODULE=n, so never deref
it.  Change uses of module->name to module_name(module) and corrects
some dyslexic printks and docbook comments.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
James Bottomley authored and James Bottomley committed Dec 30, 2008
1 parent 73c3367 commit 56b854b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/scsi/fcoe/libfcoe.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ static int fcoe_cpu_callback(struct notifier_block *nfb, unsigned long action,
#endif /* CONFIG_HOTPLUG_CPU */

/**
* foce_rcv - this is the fcoe receive function called by NET_RX_SOFTIRQ
* fcoe_rcv - this is the fcoe receive function called by NET_RX_SOFTIRQ
* @skb: the receive skb
* @dev: associated net device
* @ptype: context
Expand Down Expand Up @@ -991,8 +991,8 @@ static int fcoe_ethdrv_get(const struct net_device *netdev)

owner = fcoe_netdev_to_module_owner(netdev);
if (owner) {
printk(KERN_DEBUG "foce:hold driver module %s for %s\n",
owner->name, netdev->name);
printk(KERN_DEBUG "fcoe:hold driver module %s for %s\n",
module_name(owner), netdev->name);
return try_module_get(owner);
}
return -ENODEV;
Expand All @@ -1011,8 +1011,8 @@ static int fcoe_ethdrv_put(const struct net_device *netdev)

owner = fcoe_netdev_to_module_owner(netdev);
if (owner) {
printk(KERN_DEBUG "foce:release driver module %s for %s\n",
owner->name, netdev->name);
printk(KERN_DEBUG "fcoe:release driver module %s for %s\n",
module_name(owner), netdev->name);
module_put(owner);
return 0;
}
Expand Down

0 comments on commit 56b854b

Please sign in to comment.