diff options
author | Anton Salikhmetov <alexo@tuxera.com> | 2010-12-16 11:08:38 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@tuxera.com> | 2010-12-16 12:08:45 -0500 |
commit | 2753cc281c9a0e8a0a45ee2b8110866a9fe63bdd (patch) | |
tree | d28794ef990637cfcd734a8b467f119e6d69dac1 /fs/hfsplus/wrapper.c | |
parent | 596276c3571e2108f4b336be545ece2eacf3da59 (diff) |
hfsplus: over 80 character lines clean-up
Match coding style line length limitation where checkpatch.pl
reported over-80-character-line warnings.
Signed-off-by: Anton Salikhmetov <alexo@tuxera.com>
Signed-off-by: Christoph Hellwig <hch@tuxera.com>
Diffstat (limited to 'fs/hfsplus/wrapper.c')
-rw-r--r-- | fs/hfsplus/wrapper.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c index 15e0eabb489e..196231794f64 100644 --- a/fs/hfsplus/wrapper.c +++ b/fs/hfsplus/wrapper.c | |||
@@ -74,12 +74,14 @@ static int hfsplus_read_mdb(void *bufptr, struct hfsplus_wd *wd) | |||
74 | !(attrib & HFSP_WRAP_ATTRIB_SPARED)) | 74 | !(attrib & HFSP_WRAP_ATTRIB_SPARED)) |
75 | return 0; | 75 | return 0; |
76 | 76 | ||
77 | wd->ablk_size = be32_to_cpu(*(__be32 *)(bufptr + HFSP_WRAPOFF_ABLKSIZE)); | 77 | wd->ablk_size = |
78 | be32_to_cpu(*(__be32 *)(bufptr + HFSP_WRAPOFF_ABLKSIZE)); | ||
78 | if (wd->ablk_size < HFSPLUS_SECTOR_SIZE) | 79 | if (wd->ablk_size < HFSPLUS_SECTOR_SIZE) |
79 | return 0; | 80 | return 0; |
80 | if (wd->ablk_size % HFSPLUS_SECTOR_SIZE) | 81 | if (wd->ablk_size % HFSPLUS_SECTOR_SIZE) |
81 | return 0; | 82 | return 0; |
82 | wd->ablk_start = be16_to_cpu(*(__be16 *)(bufptr + HFSP_WRAPOFF_ABLKSTART)); | 83 | wd->ablk_start = |
84 | be16_to_cpu(*(__be16 *)(bufptr + HFSP_WRAPOFF_ABLKSTART)); | ||
83 | 85 | ||
84 | extent = get_unaligned_be32(bufptr + HFSP_WRAPOFF_EMBEDEXT); | 86 | extent = get_unaligned_be32(bufptr + HFSP_WRAPOFF_EMBEDEXT); |
85 | wd->embed_start = (extent >> 16) & 0xFFFF; | 87 | wd->embed_start = (extent >> 16) & 0xFFFF; |
@@ -102,7 +104,8 @@ static int hfsplus_get_last_session(struct super_block *sb, | |||
102 | if (HFSPLUS_SB(sb)->session >= 0) { | 104 | if (HFSPLUS_SB(sb)->session >= 0) { |
103 | te.cdte_track = HFSPLUS_SB(sb)->session; | 105 | te.cdte_track = HFSPLUS_SB(sb)->session; |
104 | te.cdte_format = CDROM_LBA; | 106 | te.cdte_format = CDROM_LBA; |
105 | res = ioctl_by_bdev(sb->s_bdev, CDROMREADTOCENTRY, (unsigned long)&te); | 107 | res = ioctl_by_bdev(sb->s_bdev, |
108 | CDROMREADTOCENTRY, (unsigned long)&te); | ||
106 | if (!res && (te.cdte_ctrl & CDROM_DATA_TRACK) == 4) { | 109 | if (!res && (te.cdte_ctrl & CDROM_DATA_TRACK) == 4) { |
107 | *start = (sector_t)te.cdte_addr.lba << 2; | 110 | *start = (sector_t)te.cdte_addr.lba << 2; |
108 | return 0; | 111 | return 0; |
@@ -111,7 +114,8 @@ static int hfsplus_get_last_session(struct super_block *sb, | |||
111 | return -EINVAL; | 114 | return -EINVAL; |
112 | } | 115 | } |
113 | ms_info.addr_format = CDROM_LBA; | 116 | ms_info.addr_format = CDROM_LBA; |
114 | res = ioctl_by_bdev(sb->s_bdev, CDROMMULTISESSION, (unsigned long)&ms_info); | 117 | res = ioctl_by_bdev(sb->s_bdev, CDROMMULTISESSION, |
118 | (unsigned long)&ms_info); | ||
115 | if (!res && ms_info.xa_flag) | 119 | if (!res && ms_info.xa_flag) |
116 | *start = (sector_t)ms_info.addr.lba << 2; | 120 | *start = (sector_t)ms_info.addr.lba << 2; |
117 | return 0; | 121 | return 0; |
@@ -212,7 +216,8 @@ reread: | |||
212 | blocksize >>= 1; | 216 | blocksize >>= 1; |
213 | 217 | ||
214 | if (sb_set_blocksize(sb, blocksize) != blocksize) { | 218 | if (sb_set_blocksize(sb, blocksize) != blocksize) { |
215 | printk(KERN_ERR "hfs: unable to set blocksize to %u!\n", blocksize); | 219 | printk(KERN_ERR "hfs: unable to set blocksize to %u!\n", |
220 | blocksize); | ||
216 | goto out_free_backup_vhdr; | 221 | goto out_free_backup_vhdr; |
217 | } | 222 | } |
218 | 223 | ||