namei.c (ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672) namei.c (9769f4eb3fad2dd53a5d24c81ee5f7f05450742b)
1/*
2 * linux/fs/isofs/namei.c
3 *
4 * (C) 1992 Eric Youngdale Modified for ISO 9660 filesystem.
5 *
6 * (C) 1991 Linus Torvalds - minix filesystem
7 */
8

--- 117 unchanged lines hidden (view full) ---

126 dlen = get_acorn_filename(de, tmpname, dir);
127 dpnt = tmpname;
128 } else if (sbi->s_mapping == 'n') {
129 dlen = isofs_name_translate(de, tmpname, dir);
130 dpnt = tmpname;
131 }
132
133 /*
1/*
2 * linux/fs/isofs/namei.c
3 *
4 * (C) 1992 Eric Youngdale Modified for ISO 9660 filesystem.
5 *
6 * (C) 1991 Linus Torvalds - minix filesystem
7 */
8

--- 117 unchanged lines hidden (view full) ---

126 dlen = get_acorn_filename(de, tmpname, dir);
127 dpnt = tmpname;
128 } else if (sbi->s_mapping == 'n') {
129 dlen = isofs_name_translate(de, tmpname, dir);
130 dpnt = tmpname;
131 }
132
133 /*
134 * Skip hidden or associated files unless unhide is set
134 * Skip hidden or associated files unless hide or showassoc,
135 * respectively, is set
135 */
136 match = 0;
137 if (dlen > 0 &&
136 */
137 match = 0;
138 if (dlen > 0 &&
138 (!(de->flags[-sbi->s_high_sierra] & 5)
139 || sbi->s_unhide == 'y'))
140 {
141 match = (isofs_cmp(dentry,dpnt,dlen) == 0);
139 (sbi->s_hide =='n' ||
140 (!(de->flags[-sbi->s_high_sierra] & 1))) &&
141 (sbi->s_showassoc =='y' ||
142 (!(de->flags[-sbi->s_high_sierra] & 4)))) {
143 match = (isofs_cmp(dentry, dpnt, dlen) == 0);
142 }
143 if (match) {
144 isofs_normalize_block_and_offset(de,
145 &block_saved,
146 &offset_saved);
147 *block_rv = block_saved;
148 *offset_rv = offset_saved;
144 }
145 if (match) {
146 isofs_normalize_block_and_offset(de,
147 &block_saved,
148 &offset_saved);
149 *block_rv = block_saved;
150 *offset_rv = offset_saved;
149 if (bh) brelse(bh);
151 brelse(bh);
150 return 1;
151 }
152 }
152 return 1;
153 }
154 }
153 if (bh) brelse(bh);
155 brelse(bh);
154 return 0;
155}
156
157struct dentry *isofs_lookup(struct inode * dir, struct dentry * dentry, struct nameidata *nd)
158{
159 int found;
160 unsigned long block, offset;
161 struct inode *inode;

--- 29 unchanged lines hidden --- 		156 return 0;
157}
158
159struct dentry *isofs_lookup(struct inode * dir, struct dentry * dentry, struct nameidata *nd)
160{
161 int found;
162 unsigned long block, offset;
163 struct inode *inode;

--- 29 unchanged lines hidden ---