aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/hfsplus/dir.c2
-rw-r--r--fs/hfsplus/inode.c2
-rw-r--r--fs/hfsplus/part_tbl.c4
-rw-r--r--fs/hfsplus/unicode.c20
4 files changed, 14 insertions, 14 deletions
diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index c423942793ee..f611d55c9f5e 100644
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -213,7 +213,7 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
213 err = -EIO; 213 err = -EIO;
214 goto out; 214 goto out;
215 } 215 }
216 next: 216next:
217 filp->f_pos++; 217 filp->f_pos++;
218 if (filp->f_pos >= inode->i_size) 218 if (filp->f_pos >= inode->i_size)
219 goto out; 219 goto out;
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index 8d7350e5ce0d..a8df651747f0 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -355,7 +355,7 @@ static const struct inode_operations hfsplus_file_inode_operations = {
355}; 355};
356 356
357static const struct file_operations hfsplus_file_operations = { 357static const struct file_operations hfsplus_file_operations = {
358 .llseek = generic_file_llseek, 358 .llseek = generic_file_llseek,
359 .read = do_sync_read, 359 .read = do_sync_read,
360 .aio_read = generic_file_aio_read, 360 .aio_read = generic_file_aio_read,
361 .write = do_sync_write, 361 .write = do_sync_write,
diff --git a/fs/hfsplus/part_tbl.c b/fs/hfsplus/part_tbl.c
index 79eea8efad8e..d66ad113b1cc 100644
--- a/fs/hfsplus/part_tbl.c
+++ b/fs/hfsplus/part_tbl.c
@@ -60,7 +60,7 @@ struct new_pmap {
60 */ 60 */
61struct old_pmap { 61struct old_pmap {
62 __be16 pdSig; /* Signature bytes */ 62 __be16 pdSig; /* Signature bytes */
63 struct old_pmap_entry { 63 struct old_pmap_entry {
64 __be32 pdStart; 64 __be32 pdStart;
65 __be32 pdSize; 65 __be32 pdSize;
66 __be32 pdFSID; 66 __be32 pdFSID;
@@ -97,7 +97,7 @@ static int hfs_parse_new_pmap(struct super_block *sb, struct new_pmap *pm,
97 int i = 0; 97 int i = 0;
98 98
99 do { 99 do {
100 if (!memcmp(pm->pmPartType,"Apple_HFS", 9) && 100 if (!memcmp(pm->pmPartType, "Apple_HFS", 9) &&
101 (sbi->part < 0 || sbi->part == i)) { 101 (sbi->part < 0 || sbi->part == i)) {
102 *part_start += be32_to_cpu(pm->pmPyPartStart); 102 *part_start += be32_to_cpu(pm->pmPyPartStart);
103 *part_size = be32_to_cpu(pm->pmPartBlkCnt); 103 *part_size = be32_to_cpu(pm->pmPartBlkCnt);
diff --git a/fs/hfsplus/unicode.c b/fs/hfsplus/unicode.c
index 15703e81174e..7dd90a540546 100644
--- a/fs/hfsplus/unicode.c
+++ b/fs/hfsplus/unicode.c
@@ -17,14 +17,14 @@
17/* Returns folded char, or 0 if ignorable */ 17/* Returns folded char, or 0 if ignorable */
18static inline u16 case_fold(u16 c) 18static inline u16 case_fold(u16 c)
19{ 19{
20 u16 tmp; 20 u16 tmp;
21 21
22 tmp = hfsplus_case_fold_table[c >> 8]; 22 tmp = hfsplus_case_fold_table[c >> 8];
23 if (tmp) 23 if (tmp)
24 tmp = hfsplus_case_fold_table[tmp + (c & 0xff)]; 24 tmp = hfsplus_case_fold_table[tmp + (c & 0xff)];
25 else 25 else
26 tmp = c; 26 tmp = c;
27 return tmp; 27 return tmp;
28} 28}
29 29
30/* Compare unicode strings, return values like normal strcmp */ 30/* Compare unicode strings, return values like normal strcmp */
@@ -215,7 +215,7 @@ int hfsplus_uni2asc(struct super_block *sb,
215 goto done; 215 goto done;
216 } 216 }
217 } 217 }
218 same: 218same:
219 switch (c0) { 219 switch (c0) {
220 case 0: 220 case 0:
221 cc = 0x2400; 221 cc = 0x2400;
@@ -226,7 +226,7 @@ int hfsplus_uni2asc(struct super_block *sb,
226 default: 226 default:
227 cc = c0; 227 cc = c0;
228 } 228 }
229 done: 229done:
230 res = nls->uni2char(cc, op, len); 230 res = nls->uni2char(cc, op, len);
231 if (res < 0) { 231 if (res < 0) {
232 if (res == -ENAMETOOLONG) 232 if (res == -ENAMETOOLONG)