diff options
Diffstat (limited to 'fs/isofs/namei.c')
-rw-r--r-- | fs/isofs/namei.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c index c04b3a14a3e9..c8c7e5138a01 100644 --- a/fs/isofs/namei.c +++ b/fs/isofs/namei.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * some sanity tests. | 15 | * some sanity tests. |
16 | */ | 16 | */ |
17 | static int | 17 | static int |
18 | isofs_cmp(struct dentry * dentry, const char * compare, int dlen) | 18 | isofs_cmp(struct dentry *dentry, const char *compare, int dlen) |
19 | { | 19 | { |
20 | struct qstr qstr; | 20 | struct qstr qstr; |
21 | 21 | ||
@@ -48,24 +48,24 @@ isofs_cmp(struct dentry * dentry, const char * compare, int dlen) | |||
48 | */ | 48 | */ |
49 | static unsigned long | 49 | static unsigned long |
50 | isofs_find_entry(struct inode *dir, struct dentry *dentry, | 50 | isofs_find_entry(struct inode *dir, struct dentry *dentry, |
51 | unsigned long *block_rv, unsigned long* offset_rv, | 51 | unsigned long *block_rv, unsigned long *offset_rv, |
52 | char * tmpname, struct iso_directory_record * tmpde) | 52 | char *tmpname, struct iso_directory_record *tmpde) |
53 | { | 53 | { |
54 | unsigned long bufsize = ISOFS_BUFFER_SIZE(dir); | 54 | unsigned long bufsize = ISOFS_BUFFER_SIZE(dir); |
55 | unsigned char bufbits = ISOFS_BUFFER_BITS(dir); | 55 | unsigned char bufbits = ISOFS_BUFFER_BITS(dir); |
56 | unsigned long block, f_pos, offset, block_saved, offset_saved; | 56 | unsigned long block, f_pos, offset, block_saved, offset_saved; |
57 | struct buffer_head * bh = NULL; | 57 | struct buffer_head *bh = NULL; |
58 | struct isofs_sb_info *sbi = ISOFS_SB(dir->i_sb); | 58 | struct isofs_sb_info *sbi = ISOFS_SB(dir->i_sb); |
59 | 59 | ||
60 | if (!ISOFS_I(dir)->i_first_extent) | 60 | if (!ISOFS_I(dir)->i_first_extent) |
61 | return 0; | 61 | return 0; |
62 | 62 | ||
63 | f_pos = 0; | 63 | f_pos = 0; |
64 | offset = 0; | 64 | offset = 0; |
65 | block = 0; | 65 | block = 0; |
66 | 66 | ||
67 | while (f_pos < dir->i_size) { | 67 | while (f_pos < dir->i_size) { |
68 | struct iso_directory_record * de; | 68 | struct iso_directory_record *de; |
69 | int de_len, match, i, dlen; | 69 | int de_len, match, i, dlen; |
70 | char *dpnt; | 70 | char *dpnt; |
71 | 71 | ||
@@ -114,7 +114,7 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry, | |||
114 | 114 | ||
115 | if (sbi->s_rock && | 115 | if (sbi->s_rock && |
116 | ((i = get_rock_ridge_filename(de, tmpname, dir)))) { | 116 | ((i = get_rock_ridge_filename(de, tmpname, dir)))) { |
117 | dlen = i; /* possibly -1 */ | 117 | dlen = i; /* possibly -1 */ |
118 | dpnt = tmpname; | 118 | dpnt = tmpname; |
119 | #ifdef CONFIG_JOLIET | 119 | #ifdef CONFIG_JOLIET |
120 | } else if (sbi->s_joliet_level) { | 120 | } else if (sbi->s_joliet_level) { |
@@ -145,8 +145,8 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry, | |||
145 | isofs_normalize_block_and_offset(de, | 145 | isofs_normalize_block_and_offset(de, |
146 | &block_saved, | 146 | &block_saved, |
147 | &offset_saved); | 147 | &offset_saved); |
148 | *block_rv = block_saved; | 148 | *block_rv = block_saved; |
149 | *offset_rv = offset_saved; | 149 | *offset_rv = offset_saved; |
150 | brelse(bh); | 150 | brelse(bh); |
151 | return 1; | 151 | return 1; |
152 | } | 152 | } |
@@ -155,7 +155,7 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry, | |||
155 | return 0; | 155 | return 0; |
156 | } | 156 | } |
157 | 157 | ||
158 | struct dentry *isofs_lookup(struct inode * dir, struct dentry * dentry, struct nameidata *nd) | 158 | struct dentry *isofs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd) |
159 | { | 159 | { |
160 | int found; | 160 | int found; |
161 | unsigned long block, offset; | 161 | unsigned long block, offset; |
@@ -170,9 +170,9 @@ struct dentry *isofs_lookup(struct inode * dir, struct dentry * dentry, struct n | |||
170 | 170 | ||
171 | lock_kernel(); | 171 | lock_kernel(); |
172 | found = isofs_find_entry(dir, dentry, | 172 | found = isofs_find_entry(dir, dentry, |
173 | &block, &offset, | 173 | &block, &offset, |
174 | page_address(page), | 174 | page_address(page), |
175 | 1024 + page_address(page)); | 175 | 1024 + page_address(page)); |
176 | __free_page(page); | 176 | __free_page(page); |
177 | 177 | ||
178 | inode = NULL; | 178 | inode = NULL; |