aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2011-03-30 21:57:33 -0400
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2011-03-31 10:26:23 -0400
commit25985edcedea6396277003854657b5f3cb31a628 (patch)
treef026e810210a2ee7290caeb737c23cb6472b7c38 /drivers/block
parent6aba74f2791287ec407e0f92487a725a25908067 (diff)
Fix common misspellings
Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/DAC960.c2
-rw-r--r--drivers/block/drbd/drbd_actlog.c2
-rw-r--r--drivers/block/drbd/drbd_int.h10
-rw-r--r--drivers/block/drbd/drbd_main.c4
-rw-r--r--drivers/block/drbd/drbd_receiver.c2
-rw-r--r--drivers/block/drbd/drbd_vli.h2
-rw-r--r--drivers/block/hd.c2
-rw-r--r--drivers/block/viodasd.c2
-rw-r--r--drivers/block/xsysace.c8
9 files changed, 17 insertions, 17 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 79882104e431..8066d086578a 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -1790,7 +1790,7 @@ static bool DAC960_V2_ReadControllerConfiguration(DAC960_Controller_T
1790 unsigned short LogicalDeviceNumber = 0; 1790 unsigned short LogicalDeviceNumber = 0;
1791 int ModelNameLength; 1791 int ModelNameLength;
1792 1792
1793 /* Get data into dma-able area, then copy into permanant location */ 1793 /* Get data into dma-able area, then copy into permanent location */
1794 if (!DAC960_V2_NewControllerInfo(Controller)) 1794 if (!DAC960_V2_NewControllerInfo(Controller))
1795 return DAC960_Failure(Controller, "GET CONTROLLER INFO"); 1795 return DAC960_Failure(Controller, "GET CONTROLLER INFO");
1796 memcpy(ControllerInfo, Controller->V2.NewControllerInformation, 1796 memcpy(ControllerInfo, Controller->V2.NewControllerInformation,
diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c
index 2a1642bc451d..c6828b68d77b 100644
--- a/drivers/block/drbd/drbd_actlog.c
+++ b/drivers/block/drbd/drbd_actlog.c
@@ -30,7 +30,7 @@
30 30
31/* We maintain a trivial check sum in our on disk activity log. 31/* We maintain a trivial check sum in our on disk activity log.
32 * With that we can ensure correct operation even when the storage 32 * With that we can ensure correct operation even when the storage
33 * device might do a partial (last) sector write while loosing power. 33 * device might do a partial (last) sector write while losing power.
34 */ 34 */
35struct __packed al_transaction { 35struct __packed al_transaction {
36 u32 magic; 36 u32 magic;
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 81030d8d654b..b2699bb2e530 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -622,7 +622,7 @@ DCBP_set_pad_bits(struct p_compressed_bm *p, int n)
622/* one bitmap packet, including the p_header, 622/* one bitmap packet, including the p_header,
623 * should fit within one _architecture independend_ page. 623 * should fit within one _architecture independend_ page.
624 * so we need to use the fixed size 4KiB page size 624 * so we need to use the fixed size 4KiB page size
625 * most architechtures have used for a long time. 625 * most architectures have used for a long time.
626 */ 626 */
627#define BM_PACKET_PAYLOAD_BYTES (4096 - sizeof(struct p_header80)) 627#define BM_PACKET_PAYLOAD_BYTES (4096 - sizeof(struct p_header80))
628#define BM_PACKET_WORDS (BM_PACKET_PAYLOAD_BYTES/sizeof(long)) 628#define BM_PACKET_WORDS (BM_PACKET_PAYLOAD_BYTES/sizeof(long))
@@ -810,7 +810,7 @@ enum {
810 810
811/* global flag bits */ 811/* global flag bits */
812enum { 812enum {
813 CREATE_BARRIER, /* next P_DATA is preceeded by a P_BARRIER */ 813 CREATE_BARRIER, /* next P_DATA is preceded by a P_BARRIER */
814 SIGNAL_ASENDER, /* whether asender wants to be interrupted */ 814 SIGNAL_ASENDER, /* whether asender wants to be interrupted */
815 SEND_PING, /* whether asender should send a ping asap */ 815 SEND_PING, /* whether asender should send a ping asap */
816 816
@@ -1126,7 +1126,7 @@ struct drbd_conf {
1126 int c_sync_rate; /* current resync rate after syncer throttle magic */ 1126 int c_sync_rate; /* current resync rate after syncer throttle magic */
1127 struct fifo_buffer rs_plan_s; /* correction values of resync planer */ 1127 struct fifo_buffer rs_plan_s; /* correction values of resync planer */
1128 int rs_in_flight; /* resync sectors in flight (to proxy, in proxy and from proxy) */ 1128 int rs_in_flight; /* resync sectors in flight (to proxy, in proxy and from proxy) */
1129 int rs_planed; /* resync sectors already planed */ 1129 int rs_planed; /* resync sectors already planned */
1130 atomic_t ap_in_flight; /* App sectors in flight (waiting for ack) */ 1130 atomic_t ap_in_flight; /* App sectors in flight (waiting for ack) */
1131}; 1131};
1132 1132
@@ -1144,7 +1144,7 @@ static inline unsigned int mdev_to_minor(struct drbd_conf *mdev)
1144 return mdev->minor; 1144 return mdev->minor;
1145} 1145}
1146 1146
1147/* returns 1 if it was successfull, 1147/* returns 1 if it was successful,
1148 * returns 0 if there was no data socket. 1148 * returns 0 if there was no data socket.
1149 * so wherever you are going to use the data.socket, e.g. do 1149 * so wherever you are going to use the data.socket, e.g. do
1150 * if (!drbd_get_data_sock(mdev)) 1150 * if (!drbd_get_data_sock(mdev))
@@ -2079,7 +2079,7 @@ static inline void inc_ap_pending(struct drbd_conf *mdev)
2079/* counts how many resync-related answers we still expect from the peer 2079/* counts how many resync-related answers we still expect from the peer
2080 * increase decrease 2080 * increase decrease
2081 * C_SYNC_TARGET sends P_RS_DATA_REQUEST (and expects P_RS_DATA_REPLY) 2081 * C_SYNC_TARGET sends P_RS_DATA_REQUEST (and expects P_RS_DATA_REPLY)
2082 * C_SYNC_SOURCE sends P_RS_DATA_REPLY (and expects P_WRITE_ACK whith ID_SYNCER) 2082 * C_SYNC_SOURCE sends P_RS_DATA_REPLY (and expects P_WRITE_ACK with ID_SYNCER)
2083 * (or P_NEG_ACK with ID_SYNCER) 2083 * (or P_NEG_ACK with ID_SYNCER)
2084 */ 2084 */
2085static inline void inc_rs_pending(struct drbd_conf *mdev) 2085static inline void inc_rs_pending(struct drbd_conf *mdev)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index dfc85f32d317..5b525c179f39 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1561,7 +1561,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os,
1561 if (drbd_send_state(mdev)) 1561 if (drbd_send_state(mdev))
1562 dev_warn(DEV, "Notified peer that I'm now diskless.\n"); 1562 dev_warn(DEV, "Notified peer that I'm now diskless.\n");
1563 /* corresponding get_ldev in __drbd_set_state 1563 /* corresponding get_ldev in __drbd_set_state
1564 * this may finaly trigger drbd_ldev_destroy. */ 1564 * this may finally trigger drbd_ldev_destroy. */
1565 put_ldev(mdev); 1565 put_ldev(mdev);
1566 } 1566 }
1567 1567
@@ -3706,7 +3706,7 @@ int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev)
3706 buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page); 3706 buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page);
3707 3707
3708 if (!drbd_md_sync_page_io(mdev, bdev, bdev->md.md_offset, READ)) { 3708 if (!drbd_md_sync_page_io(mdev, bdev, bdev->md.md_offset, READ)) {
3709 /* NOTE: cant do normal error processing here as this is 3709 /* NOTE: can't do normal error processing here as this is
3710 called BEFORE disk is attached */ 3710 called BEFORE disk is attached */
3711 dev_err(DEV, "Error while reading metadata.\n"); 3711 dev_err(DEV, "Error while reading metadata.\n");
3712 rv = ERR_IO_MD_DISK; 3712 rv = ERR_IO_MD_DISK;
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index fe1564c7d8b6..fd26666c0b08 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -862,7 +862,7 @@ retry:
862 msock->sk->sk_rcvtimeo = mdev->net_conf->ping_int*HZ; 862 msock->sk->sk_rcvtimeo = mdev->net_conf->ping_int*HZ;
863 863
864 /* we don't want delays. 864 /* we don't want delays.
865 * we use TCP_CORK where apropriate, though */ 865 * we use TCP_CORK where appropriate, though */
866 drbd_tcp_nodelay(sock); 866 drbd_tcp_nodelay(sock);
867 drbd_tcp_nodelay(msock); 867 drbd_tcp_nodelay(msock);
868 868
diff --git a/drivers/block/drbd/drbd_vli.h b/drivers/block/drbd/drbd_vli.h
index fc824006e721..8cb1532a3816 100644
--- a/drivers/block/drbd/drbd_vli.h
+++ b/drivers/block/drbd/drbd_vli.h
@@ -32,7 +32,7 @@
32 * the bitmap transfer time can take much too long, 32 * the bitmap transfer time can take much too long,
33 * if transmitted in plain text. 33 * if transmitted in plain text.
34 * 34 *
35 * We try to reduce the transfered bitmap information 35 * We try to reduce the transferred bitmap information
36 * by encoding runlengths of bit polarity. 36 * by encoding runlengths of bit polarity.
37 * 37 *
38 * We never actually need to encode a "zero" (runlengths are positive). 38 * We never actually need to encode a "zero" (runlengths are positive).
diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index 30ec6b37424e..007c630904c1 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -733,7 +733,7 @@ static int __init hd_init(void)
733 * the BIOS or CMOS. This doesn't work all that well, 733 * the BIOS or CMOS. This doesn't work all that well,
734 * since this assumes that this is a primary or secondary 734 * since this assumes that this is a primary or secondary
735 * drive, and if we're using this legacy driver, it's 735 * drive, and if we're using this legacy driver, it's
736 * probably an auxilliary controller added to recover 736 * probably an auxiliary controller added to recover
737 * legacy data off an ST-506 drive. Either way, it's 737 * legacy data off an ST-506 drive. Either way, it's
738 * definitely safest to have the user explicitly specify 738 * definitely safest to have the user explicitly specify
739 * the information. 739 * the information.
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index e2ff697697c2..9a5b2a2d616d 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -94,7 +94,7 @@ static const struct vio_error_entry viodasd_err_table[] = {
94 { 0x0204, EIO, "Use Error" }, 94 { 0x0204, EIO, "Use Error" },
95 { 0x0205, EIO, "Release Error" }, 95 { 0x0205, EIO, "Release Error" },
96 { 0x0206, EINVAL, "Invalid Disk" }, 96 { 0x0206, EINVAL, "Invalid Disk" },
97 { 0x0207, EBUSY, "Cant Lock" }, 97 { 0x0207, EBUSY, "Can't Lock" },
98 { 0x0208, EIO, "Already Locked" }, 98 { 0x0208, EIO, "Already Locked" },
99 { 0x0209, EIO, "Already Unlocked" }, 99 { 0x0209, EIO, "Already Unlocked" },
100 { 0x020A, EIO, "Invalid Arg" }, 100 { 0x020A, EIO, "Invalid Arg" },
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 73354b081ed3..645ff765cd12 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -621,7 +621,7 @@ static void ace_fsm_dostate(struct ace_device *ace)
621 ace_dump_mem(ace->cf_id, 512); /* Debug: Dump out disk ID */ 621 ace_dump_mem(ace->cf_id, 512); /* Debug: Dump out disk ID */
622 622
623 if (ace->data_result) { 623 if (ace->data_result) {
624 /* Error occured, disable the disk */ 624 /* Error occurred, disable the disk */
625 ace->media_change = 1; 625 ace->media_change = 1;
626 set_capacity(ace->gd, 0); 626 set_capacity(ace->gd, 0);
627 dev_err(ace->dev, "error fetching CF id (%i)\n", 627 dev_err(ace->dev, "error fetching CF id (%i)\n",
@@ -801,7 +801,7 @@ static int ace_interrupt_checkstate(struct ace_device *ace)
801 u32 sreg = ace_in32(ace, ACE_STATUS); 801 u32 sreg = ace_in32(ace, ACE_STATUS);
802 u16 creg = ace_in(ace, ACE_CTRL); 802 u16 creg = ace_in(ace, ACE_CTRL);
803 803
804 /* Check for error occurance */ 804 /* Check for error occurrence */
805 if ((sreg & (ACE_STATUS_CFGERROR | ACE_STATUS_CFCERROR)) && 805 if ((sreg & (ACE_STATUS_CFGERROR | ACE_STATUS_CFCERROR)) &&
806 (creg & ACE_CTRL_ERRORIRQ)) { 806 (creg & ACE_CTRL_ERRORIRQ)) {
807 dev_err(ace->dev, "transfer failure\n"); 807 dev_err(ace->dev, "transfer failure\n");
@@ -1169,7 +1169,7 @@ static int __devinit ace_probe(struct platform_device *dev)
1169 irq = dev->resource[i].start; 1169 irq = dev->resource[i].start;
1170 } 1170 }
1171 1171
1172 /* Call the bus-independant setup code */ 1172 /* Call the bus-independent setup code */
1173 return ace_alloc(&dev->dev, id, physaddr, irq, bus_width); 1173 return ace_alloc(&dev->dev, id, physaddr, irq, bus_width);
1174} 1174}
1175 1175
@@ -1222,7 +1222,7 @@ static int __devinit ace_of_probe(struct platform_device *op)
1222 if (of_find_property(op->dev.of_node, "8-bit", NULL)) 1222 if (of_find_property(op->dev.of_node, "8-bit", NULL))
1223 bus_width = ACE_BUS_WIDTH_8; 1223 bus_width = ACE_BUS_WIDTH_8;
1224 1224
1225 /* Call the bus-independant setup code */ 1225 /* Call the bus-independent setup code */
1226 return ace_alloc(&op->dev, id ? be32_to_cpup(id) : 0, 1226 return ace_alloc(&op->dev, id ? be32_to_cpup(id) : 0,
1227 physaddr, irq, bus_width); 1227 physaddr, irq, bus_width);
1228} 1228}