1 // SPDX-License-Identifier: GPL-2.0-or-later <<
2 /* 1 /*
3 * Copyright (C) International Business Mach 2 * Copyright (C) International Business Machines Corp., 2000-2004
4 * Portions Copyright (C) Christoph Hellwig, 3 * Portions Copyright (C) Christoph Hellwig, 2001-2002
>> 4 *
>> 5 * This program is free software; you can redistribute it and/or modify
>> 6 * it under the terms of the GNU General Public License as published by
>> 7 * the Free Software Foundation; either version 2 of the License, or
>> 8 * (at your option) any later version.
>> 9 *
>> 10 * This program is distributed in the hope that it will be useful,
>> 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
>> 13 * the GNU General Public License for more details.
>> 14 *
>> 15 * You should have received a copy of the GNU General Public License
>> 16 * along with this program; if not, write to the Free Software
>> 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
5 */ 18 */
6 19
7 #include <linux/fs.h> 20 #include <linux/fs.h>
8 #include <linux/namei.h> 21 #include <linux/namei.h>
9 #include <linux/ctype.h> 22 #include <linux/ctype.h>
10 #include <linux/quotaops.h> 23 #include <linux/quotaops.h>
11 #include <linux/exportfs.h> 24 #include <linux/exportfs.h>
12 #include "jfs_incore.h" 25 #include "jfs_incore.h"
13 #include "jfs_superblock.h" 26 #include "jfs_superblock.h"
14 #include "jfs_inode.h" 27 #include "jfs_inode.h"
15 #include "jfs_dinode.h" 28 #include "jfs_dinode.h"
16 #include "jfs_dmap.h" 29 #include "jfs_dmap.h"
17 #include "jfs_unicode.h" 30 #include "jfs_unicode.h"
18 #include "jfs_metapage.h" 31 #include "jfs_metapage.h"
19 #include "jfs_xattr.h" 32 #include "jfs_xattr.h"
20 #include "jfs_acl.h" 33 #include "jfs_acl.h"
21 #include "jfs_debug.h" 34 #include "jfs_debug.h"
22 35
23 /* 36 /*
24 * forward references 37 * forward references
25 */ 38 */
26 const struct dentry_operations jfs_ci_dentry_o 39 const struct dentry_operations jfs_ci_dentry_operations;
27 40
28 static s64 commitZeroLink(tid_t, struct inode 41 static s64 commitZeroLink(tid_t, struct inode *);
29 42
30 /* 43 /*
31 * NAME: free_ea_wmap(inode) 44 * NAME: free_ea_wmap(inode)
32 * 45 *
33 * FUNCTION: free uncommitted extended attr 46 * FUNCTION: free uncommitted extended attributes from working map
34 * 47 *
35 */ 48 */
36 static inline void free_ea_wmap(struct inode * 49 static inline void free_ea_wmap(struct inode *inode)
37 { 50 {
38 dxd_t *ea = &JFS_IP(inode)->ea; 51 dxd_t *ea = &JFS_IP(inode)->ea;
39 52
40 if (ea->flag & DXD_EXTENT) { 53 if (ea->flag & DXD_EXTENT) {
41 /* free EA pages from cache */ 54 /* free EA pages from cache */
42 invalidate_dxd_metapages(inode 55 invalidate_dxd_metapages(inode, *ea);
43 dbFree(inode, addressDXD(ea), 56 dbFree(inode, addressDXD(ea), lengthDXD(ea));
44 } 57 }
45 ea->flag = 0; 58 ea->flag = 0;
46 } 59 }
47 60
48 /* 61 /*
49 * NAME: jfs_create(dip, dentry, mode) 62 * NAME: jfs_create(dip, dentry, mode)
50 * 63 *
51 * FUNCTION: create a regular file in the p 64 * FUNCTION: create a regular file in the parent directory <dip>
52 * with name = <from dentry> and 65 * with name = <from dentry> and mode = <mode>
53 * 66 *
54 * PARAMETER: dip - parent directory vno 67 * PARAMETER: dip - parent directory vnode
55 * dentry - dentry of new file 68 * dentry - dentry of new file
56 * mode - create mode (rwxrwxr 69 * mode - create mode (rwxrwxrwx).
57 * nd- nd struct 70 * nd- nd struct
58 * 71 *
59 * RETURN: Errors from subroutines 72 * RETURN: Errors from subroutines
60 * 73 *
61 */ 74 */
62 static int jfs_create(struct mnt_idmap *idmap, !! 75 static int jfs_create(struct inode *dip, struct dentry *dentry, umode_t mode,
63 struct dentry *dentry, u !! 76 bool excl)
64 { 77 {
65 int rc = 0; 78 int rc = 0;
66 tid_t tid; /* transaction 79 tid_t tid; /* transaction id */
67 struct inode *ip = NULL; /* chi 80 struct inode *ip = NULL; /* child directory inode */
68 ino_t ino; 81 ino_t ino;
69 struct component_name dname; /* chi 82 struct component_name dname; /* child directory name */
70 struct btstack btstack; 83 struct btstack btstack;
71 struct inode *iplist[2]; 84 struct inode *iplist[2];
72 struct tblock *tblk; 85 struct tblock *tblk;
73 86
74 jfs_info("jfs_create: dip:0x%p name:%p 87 jfs_info("jfs_create: dip:0x%p name:%pd", dip, dentry);
75 88
76 rc = dquot_initialize(dip); 89 rc = dquot_initialize(dip);
77 if (rc) 90 if (rc)
78 goto out1; 91 goto out1;
79 92
80 /* 93 /*
81 * search parent directory for entry/f 94 * search parent directory for entry/freespace
82 * (dtSearch() returns parent director 95 * (dtSearch() returns parent directory page pinned)
83 */ 96 */
84 if ((rc = get_UCSname(&dname, dentry)) 97 if ((rc = get_UCSname(&dname, dentry)))
85 goto out1; 98 goto out1;
86 99
87 /* 100 /*
88 * Either iAlloc() or txBegin() may bl 101 * Either iAlloc() or txBegin() may block. Deadlock can occur if we
89 * block there while holding dtree pag 102 * block there while holding dtree page, so we allocate the inode &
90 * begin the transaction before we sea 103 * begin the transaction before we search the directory.
91 */ 104 */
92 ip = ialloc(dip, mode); 105 ip = ialloc(dip, mode);
93 if (IS_ERR(ip)) { 106 if (IS_ERR(ip)) {
94 rc = PTR_ERR(ip); 107 rc = PTR_ERR(ip);
95 goto out2; 108 goto out2;
96 } 109 }
97 110
98 tid = txBegin(dip->i_sb, 0); 111 tid = txBegin(dip->i_sb, 0);
99 112
100 mutex_lock_nested(&JFS_IP(dip)->commit 113 mutex_lock_nested(&JFS_IP(dip)->commit_mutex, COMMIT_MUTEX_PARENT);
101 mutex_lock_nested(&JFS_IP(ip)->commit_ 114 mutex_lock_nested(&JFS_IP(ip)->commit_mutex, COMMIT_MUTEX_CHILD);
102 115
103 rc = jfs_init_acl(tid, ip, dip); 116 rc = jfs_init_acl(tid, ip, dip);
104 if (rc) 117 if (rc)
105 goto out3; 118 goto out3;
106 119
107 rc = jfs_init_security(tid, ip, dip, & 120 rc = jfs_init_security(tid, ip, dip, &dentry->d_name);
108 if (rc) { 121 if (rc) {
109 txAbort(tid, 0); 122 txAbort(tid, 0);
110 goto out3; 123 goto out3;
111 } 124 }
112 125
113 if ((rc = dtSearch(dip, &dname, &ino, 126 if ((rc = dtSearch(dip, &dname, &ino, &btstack, JFS_CREATE))) {
114 jfs_err("jfs_create: dtSearch 127 jfs_err("jfs_create: dtSearch returned %d", rc);
115 txAbort(tid, 0); 128 txAbort(tid, 0);
116 goto out3; 129 goto out3;
117 } 130 }
118 131
119 tblk = tid_to_tblock(tid); 132 tblk = tid_to_tblock(tid);
120 tblk->xflag |= COMMIT_CREATE; 133 tblk->xflag |= COMMIT_CREATE;
121 tblk->ino = ip->i_ino; 134 tblk->ino = ip->i_ino;
122 tblk->u.ixpxd = JFS_IP(ip)->ixpxd; 135 tblk->u.ixpxd = JFS_IP(ip)->ixpxd;
123 136
124 iplist[0] = dip; 137 iplist[0] = dip;
125 iplist[1] = ip; 138 iplist[1] = ip;
126 139
127 /* 140 /*
128 * initialize the child XAD tree root 141 * initialize the child XAD tree root in-line in inode
129 */ 142 */
130 xtInitRoot(tid, ip); 143 xtInitRoot(tid, ip);
131 144
132 /* 145 /*
133 * create entry in parent directory fo 146 * create entry in parent directory for child directory
134 * (dtInsert() releases parent directo 147 * (dtInsert() releases parent directory page)
135 */ 148 */
136 ino = ip->i_ino; 149 ino = ip->i_ino;
137 if ((rc = dtInsert(tid, dip, &dname, & 150 if ((rc = dtInsert(tid, dip, &dname, &ino, &btstack))) {
138 if (rc == -EIO) { 151 if (rc == -EIO) {
139 jfs_err("jfs_create: d 152 jfs_err("jfs_create: dtInsert returned -EIO");
140 txAbort(tid, 1); 153 txAbort(tid, 1); /* Marks Filesystem dirty */
141 } else 154 } else
142 txAbort(tid, 0); 155 txAbort(tid, 0); /* Filesystem full */
143 goto out3; 156 goto out3;
144 } 157 }
145 158
146 ip->i_op = &jfs_file_inode_operations; 159 ip->i_op = &jfs_file_inode_operations;
147 ip->i_fop = &jfs_file_operations; 160 ip->i_fop = &jfs_file_operations;
148 ip->i_mapping->a_ops = &jfs_aops; 161 ip->i_mapping->a_ops = &jfs_aops;
149 162
150 mark_inode_dirty(ip); 163 mark_inode_dirty(ip);
151 164
152 inode_set_mtime_to_ts(dip, inode_set_c !! 165 dip->i_ctime = dip->i_mtime = current_time(dip);
153 166
154 mark_inode_dirty(dip); 167 mark_inode_dirty(dip);
155 168
156 rc = txCommit(tid, 2, &iplist[0], 0); 169 rc = txCommit(tid, 2, &iplist[0], 0);
157 170
158 out3: 171 out3:
159 txEnd(tid); 172 txEnd(tid);
160 mutex_unlock(&JFS_IP(ip)->commit_mutex 173 mutex_unlock(&JFS_IP(ip)->commit_mutex);
161 mutex_unlock(&JFS_IP(dip)->commit_mute 174 mutex_unlock(&JFS_IP(dip)->commit_mutex);
162 if (rc) { 175 if (rc) {
163 free_ea_wmap(ip); 176 free_ea_wmap(ip);
164 clear_nlink(ip); 177 clear_nlink(ip);
165 discard_new_inode(ip); !! 178 unlock_new_inode(ip);
>> 179 iput(ip);
166 } else { 180 } else {
167 d_instantiate_new(dentry, ip); !! 181 unlock_new_inode(ip);
>> 182 d_instantiate(dentry, ip);
168 } 183 }
169 184
170 out2: 185 out2:
171 free_UCSname(&dname); 186 free_UCSname(&dname);
172 187
173 out1: 188 out1:
174 189
175 jfs_info("jfs_create: rc:%d", rc); 190 jfs_info("jfs_create: rc:%d", rc);
176 return rc; 191 return rc;
177 } 192 }
178 193
179 194
180 /* 195 /*
181 * NAME: jfs_mkdir(dip, dentry, mode) 196 * NAME: jfs_mkdir(dip, dentry, mode)
182 * 197 *
183 * FUNCTION: create a child directory in th 198 * FUNCTION: create a child directory in the parent directory <dip>
184 * with name = <from dentry> and 199 * with name = <from dentry> and mode = <mode>
185 * 200 *
186 * PARAMETER: dip - parent directory vno 201 * PARAMETER: dip - parent directory vnode
187 * dentry - dentry of child dire 202 * dentry - dentry of child directory
188 * mode - create mode (rwxrwxr 203 * mode - create mode (rwxrwxrwx).
189 * 204 *
190 * RETURN: Errors from subroutines 205 * RETURN: Errors from subroutines
191 * 206 *
192 * note: 207 * note:
193 * EACCES: user needs search+write permission !! 208 * EACCESS: user needs search+write permission on the parent directory
194 */ 209 */
195 static int jfs_mkdir(struct mnt_idmap *idmap, !! 210 static int jfs_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
196 struct dentry *dentry, um <<
197 { 211 {
198 int rc = 0; 212 int rc = 0;
199 tid_t tid; /* transaction 213 tid_t tid; /* transaction id */
200 struct inode *ip = NULL; /* chi 214 struct inode *ip = NULL; /* child directory inode */
201 ino_t ino; 215 ino_t ino;
202 struct component_name dname; /* chi 216 struct component_name dname; /* child directory name */
203 struct btstack btstack; 217 struct btstack btstack;
204 struct inode *iplist[2]; 218 struct inode *iplist[2];
205 struct tblock *tblk; 219 struct tblock *tblk;
206 220
207 jfs_info("jfs_mkdir: dip:0x%p name:%pd 221 jfs_info("jfs_mkdir: dip:0x%p name:%pd", dip, dentry);
208 222
209 rc = dquot_initialize(dip); 223 rc = dquot_initialize(dip);
210 if (rc) 224 if (rc)
211 goto out1; 225 goto out1;
212 226
213 /* 227 /*
214 * search parent directory for entry/f 228 * search parent directory for entry/freespace
215 * (dtSearch() returns parent director 229 * (dtSearch() returns parent directory page pinned)
216 */ 230 */
217 if ((rc = get_UCSname(&dname, dentry)) 231 if ((rc = get_UCSname(&dname, dentry)))
218 goto out1; 232 goto out1;
219 233
220 /* 234 /*
221 * Either iAlloc() or txBegin() may bl 235 * Either iAlloc() or txBegin() may block. Deadlock can occur if we
222 * block there while holding dtree pag 236 * block there while holding dtree page, so we allocate the inode &
223 * begin the transaction before we sea 237 * begin the transaction before we search the directory.
224 */ 238 */
225 ip = ialloc(dip, S_IFDIR | mode); 239 ip = ialloc(dip, S_IFDIR | mode);
226 if (IS_ERR(ip)) { 240 if (IS_ERR(ip)) {
227 rc = PTR_ERR(ip); 241 rc = PTR_ERR(ip);
228 goto out2; 242 goto out2;
229 } 243 }
230 244
231 tid = txBegin(dip->i_sb, 0); 245 tid = txBegin(dip->i_sb, 0);
232 246
233 mutex_lock_nested(&JFS_IP(dip)->commit 247 mutex_lock_nested(&JFS_IP(dip)->commit_mutex, COMMIT_MUTEX_PARENT);
234 mutex_lock_nested(&JFS_IP(ip)->commit_ 248 mutex_lock_nested(&JFS_IP(ip)->commit_mutex, COMMIT_MUTEX_CHILD);
235 249
236 rc = jfs_init_acl(tid, ip, dip); 250 rc = jfs_init_acl(tid, ip, dip);
237 if (rc) 251 if (rc)
238 goto out3; 252 goto out3;
239 253
240 rc = jfs_init_security(tid, ip, dip, & 254 rc = jfs_init_security(tid, ip, dip, &dentry->d_name);
241 if (rc) { 255 if (rc) {
242 txAbort(tid, 0); 256 txAbort(tid, 0);
243 goto out3; 257 goto out3;
244 } 258 }
245 259
246 if ((rc = dtSearch(dip, &dname, &ino, 260 if ((rc = dtSearch(dip, &dname, &ino, &btstack, JFS_CREATE))) {
247 jfs_err("jfs_mkdir: dtSearch r 261 jfs_err("jfs_mkdir: dtSearch returned %d", rc);
248 txAbort(tid, 0); 262 txAbort(tid, 0);
249 goto out3; 263 goto out3;
250 } 264 }
251 265
252 tblk = tid_to_tblock(tid); 266 tblk = tid_to_tblock(tid);
253 tblk->xflag |= COMMIT_CREATE; 267 tblk->xflag |= COMMIT_CREATE;
254 tblk->ino = ip->i_ino; 268 tblk->ino = ip->i_ino;
255 tblk->u.ixpxd = JFS_IP(ip)->ixpxd; 269 tblk->u.ixpxd = JFS_IP(ip)->ixpxd;
256 270
257 iplist[0] = dip; 271 iplist[0] = dip;
258 iplist[1] = ip; 272 iplist[1] = ip;
259 273
260 /* 274 /*
261 * initialize the child directory in-l 275 * initialize the child directory in-line in inode
262 */ 276 */
263 dtInitRoot(tid, ip, dip->i_ino); 277 dtInitRoot(tid, ip, dip->i_ino);
264 278
265 /* 279 /*
266 * create entry in parent directory fo 280 * create entry in parent directory for child directory
267 * (dtInsert() releases parent directo 281 * (dtInsert() releases parent directory page)
268 */ 282 */
269 ino = ip->i_ino; 283 ino = ip->i_ino;
270 if ((rc = dtInsert(tid, dip, &dname, & 284 if ((rc = dtInsert(tid, dip, &dname, &ino, &btstack))) {
271 if (rc == -EIO) { 285 if (rc == -EIO) {
272 jfs_err("jfs_mkdir: dt 286 jfs_err("jfs_mkdir: dtInsert returned -EIO");
273 txAbort(tid, 1); 287 txAbort(tid, 1); /* Marks Filesystem dirty */
274 } else 288 } else
275 txAbort(tid, 0); 289 txAbort(tid, 0); /* Filesystem full */
276 goto out3; 290 goto out3;
277 } 291 }
278 292
279 set_nlink(ip, 2); /* for '.' */ 293 set_nlink(ip, 2); /* for '.' */
280 ip->i_op = &jfs_dir_inode_operations; 294 ip->i_op = &jfs_dir_inode_operations;
281 ip->i_fop = &jfs_dir_operations; 295 ip->i_fop = &jfs_dir_operations;
282 296
283 mark_inode_dirty(ip); 297 mark_inode_dirty(ip);
284 298
285 /* update parent directory inode */ 299 /* update parent directory inode */
286 inc_nlink(dip); /* for '..' fr 300 inc_nlink(dip); /* for '..' from child directory */
287 inode_set_mtime_to_ts(dip, inode_set_c !! 301 dip->i_ctime = dip->i_mtime = current_time(dip);
288 mark_inode_dirty(dip); 302 mark_inode_dirty(dip);
289 303
290 rc = txCommit(tid, 2, &iplist[0], 0); 304 rc = txCommit(tid, 2, &iplist[0], 0);
291 305
292 out3: 306 out3:
293 txEnd(tid); 307 txEnd(tid);
294 mutex_unlock(&JFS_IP(ip)->commit_mutex 308 mutex_unlock(&JFS_IP(ip)->commit_mutex);
295 mutex_unlock(&JFS_IP(dip)->commit_mute 309 mutex_unlock(&JFS_IP(dip)->commit_mutex);
296 if (rc) { 310 if (rc) {
297 free_ea_wmap(ip); 311 free_ea_wmap(ip);
298 clear_nlink(ip); 312 clear_nlink(ip);
299 discard_new_inode(ip); !! 313 unlock_new_inode(ip);
>> 314 iput(ip);
300 } else { 315 } else {
301 d_instantiate_new(dentry, ip); !! 316 unlock_new_inode(ip);
>> 317 d_instantiate(dentry, ip);
302 } 318 }
303 319
304 out2: 320 out2:
305 free_UCSname(&dname); 321 free_UCSname(&dname);
306 322
307 323
308 out1: 324 out1:
309 325
310 jfs_info("jfs_mkdir: rc:%d", rc); 326 jfs_info("jfs_mkdir: rc:%d", rc);
311 return rc; 327 return rc;
312 } 328 }
313 329
314 /* 330 /*
315 * NAME: jfs_rmdir(dip, dentry) 331 * NAME: jfs_rmdir(dip, dentry)
316 * 332 *
317 * FUNCTION: remove a link to child directo 333 * FUNCTION: remove a link to child directory
318 * 334 *
319 * PARAMETER: dip - parent inode 335 * PARAMETER: dip - parent inode
320 * dentry - child directory dent 336 * dentry - child directory dentry
321 * 337 *
322 * RETURN: -EINVAL - if name is . or .. 338 * RETURN: -EINVAL - if name is . or ..
323 * -EINVAL - if . or .. exist but 339 * -EINVAL - if . or .. exist but are invalid.
324 * errors from subroutines 340 * errors from subroutines
325 * 341 *
326 * note: 342 * note:
327 * if other threads have the directory open wh 343 * if other threads have the directory open when the last link
328 * is removed, the "." and ".." entries, if pr 344 * is removed, the "." and ".." entries, if present, are removed before
329 * rmdir() returns and no new entries may be c 345 * rmdir() returns and no new entries may be created in the directory,
330 * but the directory is not removed until the 346 * but the directory is not removed until the last reference to
331 * the directory is released (cf.unlink() of r 347 * the directory is released (cf.unlink() of regular file).
332 */ 348 */
333 static int jfs_rmdir(struct inode *dip, struct 349 static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
334 { 350 {
335 int rc; 351 int rc;
336 tid_t tid; /* transaction 352 tid_t tid; /* transaction id */
337 struct inode *ip = d_inode(dentry); 353 struct inode *ip = d_inode(dentry);
338 ino_t ino; 354 ino_t ino;
339 struct component_name dname; 355 struct component_name dname;
340 struct inode *iplist[2]; 356 struct inode *iplist[2];
341 struct tblock *tblk; 357 struct tblock *tblk;
342 358
343 jfs_info("jfs_rmdir: dip:0x%p name:%pd 359 jfs_info("jfs_rmdir: dip:0x%p name:%pd", dip, dentry);
344 360
345 /* Init inode for quota operations. */ 361 /* Init inode for quota operations. */
346 rc = dquot_initialize(dip); 362 rc = dquot_initialize(dip);
347 if (rc) 363 if (rc)
348 goto out; 364 goto out;
349 rc = dquot_initialize(ip); 365 rc = dquot_initialize(ip);
350 if (rc) 366 if (rc)
351 goto out; 367 goto out;
352 368
353 /* directory must be empty to be remov 369 /* directory must be empty to be removed */
354 if (!dtEmpty(ip)) { 370 if (!dtEmpty(ip)) {
355 rc = -ENOTEMPTY; 371 rc = -ENOTEMPTY;
356 goto out; 372 goto out;
357 } 373 }
358 374
359 if ((rc = get_UCSname(&dname, dentry)) 375 if ((rc = get_UCSname(&dname, dentry))) {
360 goto out; 376 goto out;
361 } 377 }
362 378
363 tid = txBegin(dip->i_sb, 0); 379 tid = txBegin(dip->i_sb, 0);
364 380
365 mutex_lock_nested(&JFS_IP(dip)->commit 381 mutex_lock_nested(&JFS_IP(dip)->commit_mutex, COMMIT_MUTEX_PARENT);
366 mutex_lock_nested(&JFS_IP(ip)->commit_ 382 mutex_lock_nested(&JFS_IP(ip)->commit_mutex, COMMIT_MUTEX_CHILD);
367 383
368 iplist[0] = dip; 384 iplist[0] = dip;
369 iplist[1] = ip; 385 iplist[1] = ip;
370 386
371 tblk = tid_to_tblock(tid); 387 tblk = tid_to_tblock(tid);
372 tblk->xflag |= COMMIT_DELETE; 388 tblk->xflag |= COMMIT_DELETE;
373 tblk->u.ip = ip; 389 tblk->u.ip = ip;
374 390
375 /* 391 /*
376 * delete the entry of target director 392 * delete the entry of target directory from parent directory
377 */ 393 */
378 ino = ip->i_ino; 394 ino = ip->i_ino;
379 if ((rc = dtDelete(tid, dip, &dname, & 395 if ((rc = dtDelete(tid, dip, &dname, &ino, JFS_REMOVE))) {
380 jfs_err("jfs_rmdir: dtDelete r 396 jfs_err("jfs_rmdir: dtDelete returned %d", rc);
381 if (rc == -EIO) 397 if (rc == -EIO)
382 txAbort(tid, 1); 398 txAbort(tid, 1);
383 txEnd(tid); 399 txEnd(tid);
384 mutex_unlock(&JFS_IP(ip)->comm 400 mutex_unlock(&JFS_IP(ip)->commit_mutex);
385 mutex_unlock(&JFS_IP(dip)->com 401 mutex_unlock(&JFS_IP(dip)->commit_mutex);
386 402
387 goto out2; 403 goto out2;
388 } 404 }
389 405
390 /* update parent directory's link coun 406 /* update parent directory's link count corresponding
391 * to ".." entry of the target directo 407 * to ".." entry of the target directory deleted
392 */ 408 */
393 inode_set_mtime_to_ts(dip, inode_set_c !! 409 dip->i_ctime = dip->i_mtime = current_time(dip);
394 inode_dec_link_count(dip); 410 inode_dec_link_count(dip);
395 411
396 /* 412 /*
397 * OS/2 could have created EA and/or A 413 * OS/2 could have created EA and/or ACL
398 */ 414 */
399 /* free EA from both persistent and wo 415 /* free EA from both persistent and working map */
400 if (JFS_IP(ip)->ea.flag & DXD_EXTENT) 416 if (JFS_IP(ip)->ea.flag & DXD_EXTENT) {
401 /* free EA pages */ 417 /* free EA pages */
402 txEA(tid, ip, &JFS_IP(ip)->ea, 418 txEA(tid, ip, &JFS_IP(ip)->ea, NULL);
403 } 419 }
404 JFS_IP(ip)->ea.flag = 0; 420 JFS_IP(ip)->ea.flag = 0;
405 421
406 /* free ACL from both persistent and w 422 /* free ACL from both persistent and working map */
407 if (JFS_IP(ip)->acl.flag & DXD_EXTENT) 423 if (JFS_IP(ip)->acl.flag & DXD_EXTENT) {
408 /* free ACL pages */ 424 /* free ACL pages */
409 txEA(tid, ip, &JFS_IP(ip)->acl 425 txEA(tid, ip, &JFS_IP(ip)->acl, NULL);
410 } 426 }
411 JFS_IP(ip)->acl.flag = 0; 427 JFS_IP(ip)->acl.flag = 0;
412 428
413 /* mark the target directory as delete 429 /* mark the target directory as deleted */
414 clear_nlink(ip); 430 clear_nlink(ip);
415 mark_inode_dirty(ip); 431 mark_inode_dirty(ip);
416 432
417 rc = txCommit(tid, 2, &iplist[0], 0); 433 rc = txCommit(tid, 2, &iplist[0], 0);
418 434
419 txEnd(tid); 435 txEnd(tid);
420 436
421 mutex_unlock(&JFS_IP(ip)->commit_mutex 437 mutex_unlock(&JFS_IP(ip)->commit_mutex);
422 mutex_unlock(&JFS_IP(dip)->commit_mute 438 mutex_unlock(&JFS_IP(dip)->commit_mutex);
423 439
424 /* 440 /*
425 * Truncating the directory index tabl 441 * Truncating the directory index table is not guaranteed. It
426 * may need to be done iteratively 442 * may need to be done iteratively
427 */ 443 */
428 if (test_cflag(COMMIT_Stale, dip)) { 444 if (test_cflag(COMMIT_Stale, dip)) {
429 if (dip->i_size > 1) 445 if (dip->i_size > 1)
430 jfs_truncate_nolock(di 446 jfs_truncate_nolock(dip, 0);
431 447
432 clear_cflag(COMMIT_Stale, dip) 448 clear_cflag(COMMIT_Stale, dip);
433 } 449 }
434 450
435 out2: 451 out2:
436 free_UCSname(&dname); 452 free_UCSname(&dname);
437 453
438 out: 454 out:
439 jfs_info("jfs_rmdir: rc:%d", rc); 455 jfs_info("jfs_rmdir: rc:%d", rc);
440 return rc; 456 return rc;
441 } 457 }
442 458
443 /* 459 /*
444 * NAME: jfs_unlink(dip, dentry) 460 * NAME: jfs_unlink(dip, dentry)
445 * 461 *
446 * FUNCTION: remove a link to object <vp> n 462 * FUNCTION: remove a link to object <vp> named by <name>
447 * from parent directory <dvp> 463 * from parent directory <dvp>
448 * 464 *
449 * PARAMETER: dip - inode of parent dire 465 * PARAMETER: dip - inode of parent directory
450 * dentry - dentry of object to 466 * dentry - dentry of object to be removed
451 * 467 *
452 * RETURN: errors from subroutines 468 * RETURN: errors from subroutines
453 * 469 *
454 * note: 470 * note:
455 * temporary file: if one or more processes ha 471 * temporary file: if one or more processes have the file open
456 * when the last link is removed, the link wil 472 * when the last link is removed, the link will be removed before
457 * unlink() returns, but the removal of the fi 473 * unlink() returns, but the removal of the file contents will be
458 * postponed until all references to the files 474 * postponed until all references to the files are closed.
459 * 475 *
460 * JFS does NOT support unlink() on directorie 476 * JFS does NOT support unlink() on directories.
461 * 477 *
462 */ 478 */
463 static int jfs_unlink(struct inode *dip, struc 479 static int jfs_unlink(struct inode *dip, struct dentry *dentry)
464 { 480 {
465 int rc; 481 int rc;
466 tid_t tid; /* transaction 482 tid_t tid; /* transaction id */
467 struct inode *ip = d_inode(dentry); 483 struct inode *ip = d_inode(dentry);
468 ino_t ino; 484 ino_t ino;
469 struct component_name dname; /* obj 485 struct component_name dname; /* object name */
470 struct inode *iplist[2]; 486 struct inode *iplist[2];
471 struct tblock *tblk; 487 struct tblock *tblk;
472 s64 new_size = 0; 488 s64 new_size = 0;
473 int commit_flag; 489 int commit_flag;
474 490
475 jfs_info("jfs_unlink: dip:0x%p name:%p 491 jfs_info("jfs_unlink: dip:0x%p name:%pd", dip, dentry);
476 492
477 /* Init inode for quota operations. */ 493 /* Init inode for quota operations. */
478 rc = dquot_initialize(dip); 494 rc = dquot_initialize(dip);
479 if (rc) 495 if (rc)
480 goto out; 496 goto out;
481 rc = dquot_initialize(ip); 497 rc = dquot_initialize(ip);
482 if (rc) 498 if (rc)
483 goto out; 499 goto out;
484 500
485 if ((rc = get_UCSname(&dname, dentry)) 501 if ((rc = get_UCSname(&dname, dentry)))
486 goto out; 502 goto out;
487 503
488 IWRITE_LOCK(ip, RDWRLOCK_NORMAL); 504 IWRITE_LOCK(ip, RDWRLOCK_NORMAL);
489 505
490 tid = txBegin(dip->i_sb, 0); 506 tid = txBegin(dip->i_sb, 0);
491 507
492 mutex_lock_nested(&JFS_IP(dip)->commit 508 mutex_lock_nested(&JFS_IP(dip)->commit_mutex, COMMIT_MUTEX_PARENT);
493 mutex_lock_nested(&JFS_IP(ip)->commit_ 509 mutex_lock_nested(&JFS_IP(ip)->commit_mutex, COMMIT_MUTEX_CHILD);
494 510
495 iplist[0] = dip; 511 iplist[0] = dip;
496 iplist[1] = ip; 512 iplist[1] = ip;
497 513
498 /* 514 /*
499 * delete the entry of target file fro 515 * delete the entry of target file from parent directory
500 */ 516 */
501 ino = ip->i_ino; 517 ino = ip->i_ino;
502 if ((rc = dtDelete(tid, dip, &dname, & 518 if ((rc = dtDelete(tid, dip, &dname, &ino, JFS_REMOVE))) {
503 jfs_err("jfs_unlink: dtDelete 519 jfs_err("jfs_unlink: dtDelete returned %d", rc);
504 if (rc == -EIO) 520 if (rc == -EIO)
505 txAbort(tid, 1); 521 txAbort(tid, 1); /* Marks FS Dirty */
506 txEnd(tid); 522 txEnd(tid);
507 mutex_unlock(&JFS_IP(ip)->comm 523 mutex_unlock(&JFS_IP(ip)->commit_mutex);
508 mutex_unlock(&JFS_IP(dip)->com 524 mutex_unlock(&JFS_IP(dip)->commit_mutex);
509 IWRITE_UNLOCK(ip); 525 IWRITE_UNLOCK(ip);
510 goto out1; 526 goto out1;
511 } 527 }
512 528
513 ASSERT(ip->i_nlink); 529 ASSERT(ip->i_nlink);
514 530
515 inode_set_mtime_to_ts(dip, !! 531 ip->i_ctime = dip->i_ctime = dip->i_mtime = current_time(ip);
516 inode_set_ctime_ <<
517 mark_inode_dirty(dip); 532 mark_inode_dirty(dip);
518 533
519 /* update target's inode */ 534 /* update target's inode */
520 inode_dec_link_count(ip); 535 inode_dec_link_count(ip);
521 536
522 /* 537 /*
523 * commit zero link count object 538 * commit zero link count object
524 */ 539 */
525 if (ip->i_nlink == 0) { 540 if (ip->i_nlink == 0) {
526 assert(!test_cflag(COMMIT_Noli 541 assert(!test_cflag(COMMIT_Nolink, ip));
527 /* free block resources */ 542 /* free block resources */
528 if ((new_size = commitZeroLink 543 if ((new_size = commitZeroLink(tid, ip)) < 0) {
529 txAbort(tid, 1); 544 txAbort(tid, 1); /* Marks FS Dirty */
530 txEnd(tid); 545 txEnd(tid);
531 mutex_unlock(&JFS_IP(i 546 mutex_unlock(&JFS_IP(ip)->commit_mutex);
532 mutex_unlock(&JFS_IP(d 547 mutex_unlock(&JFS_IP(dip)->commit_mutex);
533 IWRITE_UNLOCK(ip); 548 IWRITE_UNLOCK(ip);
534 rc = new_size; 549 rc = new_size;
535 goto out1; 550 goto out1;
536 } 551 }
537 tblk = tid_to_tblock(tid); 552 tblk = tid_to_tblock(tid);
538 tblk->xflag |= COMMIT_DELETE; 553 tblk->xflag |= COMMIT_DELETE;
539 tblk->u.ip = ip; 554 tblk->u.ip = ip;
540 } 555 }
541 556
542 /* 557 /*
543 * Incomplete truncate of file data ca 558 * Incomplete truncate of file data can
544 * result in timing problems unless we 559 * result in timing problems unless we synchronously commit the
545 * transaction. 560 * transaction.
546 */ 561 */
547 if (new_size) 562 if (new_size)
548 commit_flag = COMMIT_SYNC; 563 commit_flag = COMMIT_SYNC;
549 else 564 else
550 commit_flag = 0; 565 commit_flag = 0;
551 566
552 /* 567 /*
553 * If xtTruncate was incomplete, commi 568 * If xtTruncate was incomplete, commit synchronously to avoid
554 * timing complications 569 * timing complications
555 */ 570 */
556 rc = txCommit(tid, 2, &iplist[0], comm 571 rc = txCommit(tid, 2, &iplist[0], commit_flag);
557 572
558 txEnd(tid); 573 txEnd(tid);
559 574
560 mutex_unlock(&JFS_IP(ip)->commit_mutex 575 mutex_unlock(&JFS_IP(ip)->commit_mutex);
561 mutex_unlock(&JFS_IP(dip)->commit_mute 576 mutex_unlock(&JFS_IP(dip)->commit_mutex);
562 577
563 while (new_size && (rc == 0)) { 578 while (new_size && (rc == 0)) {
564 tid = txBegin(dip->i_sb, 0); 579 tid = txBegin(dip->i_sb, 0);
565 mutex_lock(&JFS_IP(ip)->commit 580 mutex_lock(&JFS_IP(ip)->commit_mutex);
566 new_size = xtTruncate_pmap(tid 581 new_size = xtTruncate_pmap(tid, ip, new_size);
567 if (new_size < 0) { 582 if (new_size < 0) {
568 txAbort(tid, 1); 583 txAbort(tid, 1); /* Marks FS Dirty */
569 rc = new_size; 584 rc = new_size;
570 } else 585 } else
571 rc = txCommit(tid, 2, 586 rc = txCommit(tid, 2, &iplist[0], COMMIT_SYNC);
572 txEnd(tid); 587 txEnd(tid);
573 mutex_unlock(&JFS_IP(ip)->comm 588 mutex_unlock(&JFS_IP(ip)->commit_mutex);
574 } 589 }
575 590
576 if (ip->i_nlink == 0) 591 if (ip->i_nlink == 0)
577 set_cflag(COMMIT_Nolink, ip); 592 set_cflag(COMMIT_Nolink, ip);
578 593
579 IWRITE_UNLOCK(ip); 594 IWRITE_UNLOCK(ip);
580 595
581 /* 596 /*
582 * Truncating the directory index tabl 597 * Truncating the directory index table is not guaranteed. It
583 * may need to be done iteratively 598 * may need to be done iteratively
584 */ 599 */
585 if (test_cflag(COMMIT_Stale, dip)) { 600 if (test_cflag(COMMIT_Stale, dip)) {
586 if (dip->i_size > 1) 601 if (dip->i_size > 1)
587 jfs_truncate_nolock(di 602 jfs_truncate_nolock(dip, 0);
588 603
589 clear_cflag(COMMIT_Stale, dip) 604 clear_cflag(COMMIT_Stale, dip);
590 } 605 }
591 606
592 out1: 607 out1:
593 free_UCSname(&dname); 608 free_UCSname(&dname);
594 out: 609 out:
595 jfs_info("jfs_unlink: rc:%d", rc); 610 jfs_info("jfs_unlink: rc:%d", rc);
596 return rc; 611 return rc;
597 } 612 }
598 613
599 /* 614 /*
600 * NAME: commitZeroLink() 615 * NAME: commitZeroLink()
601 * 616 *
602 * FUNCTION: for non-directory, called by j 617 * FUNCTION: for non-directory, called by jfs_remove(),
603 * truncate a regular file, direc 618 * truncate a regular file, directory or symbolic
604 * link to zero length. return 0 619 * link to zero length. return 0 if type is not
605 * one of these. 620 * one of these.
606 * 621 *
607 * if the file is currently assoc 622 * if the file is currently associated with a VM segment
608 * only permanent disk and inode 623 * only permanent disk and inode map resources are freed,
609 * and neither the inode nor indi 624 * and neither the inode nor indirect blocks are modified
610 * so that the resources can be l 625 * so that the resources can be later freed in the work
611 * map by ctrunc1. 626 * map by ctrunc1.
612 * if there is no VM segment on e 627 * if there is no VM segment on entry, the resources are
613 * freed in both work and permane 628 * freed in both work and permanent map.
614 * (? for temporary file - memory 629 * (? for temporary file - memory object is cached even
615 * after no reference: 630 * after no reference:
616 * reference count > 0 - ) 631 * reference count > 0 - )
617 * 632 *
618 * PARAMETERS: cd - pointer to commit da 633 * PARAMETERS: cd - pointer to commit data structure.
619 * current inode is the 634 * current inode is the one to truncate.
620 * 635 *
621 * RETURN: Errors from subroutines 636 * RETURN: Errors from subroutines
622 */ 637 */
623 static s64 commitZeroLink(tid_t tid, struct in 638 static s64 commitZeroLink(tid_t tid, struct inode *ip)
624 { 639 {
625 int filetype; 640 int filetype;
626 struct tblock *tblk; 641 struct tblock *tblk;
627 642
628 jfs_info("commitZeroLink: tid = %d, ip 643 jfs_info("commitZeroLink: tid = %d, ip = 0x%p", tid, ip);
629 644
630 filetype = ip->i_mode & S_IFMT; 645 filetype = ip->i_mode & S_IFMT;
631 switch (filetype) { 646 switch (filetype) {
632 case S_IFREG: 647 case S_IFREG:
633 break; 648 break;
634 case S_IFLNK: 649 case S_IFLNK:
635 /* fast symbolic link */ 650 /* fast symbolic link */
636 if (ip->i_size < IDATASIZE) { 651 if (ip->i_size < IDATASIZE) {
637 ip->i_size = 0; 652 ip->i_size = 0;
638 return 0; 653 return 0;
639 } 654 }
640 break; 655 break;
641 default: 656 default:
642 assert(filetype != S_IFDIR); 657 assert(filetype != S_IFDIR);
643 return 0; 658 return 0;
644 } 659 }
645 660
646 set_cflag(COMMIT_Freewmap, ip); 661 set_cflag(COMMIT_Freewmap, ip);
647 662
648 /* mark transaction of block map updat 663 /* mark transaction of block map update type */
649 tblk = tid_to_tblock(tid); 664 tblk = tid_to_tblock(tid);
650 tblk->xflag |= COMMIT_PMAP; 665 tblk->xflag |= COMMIT_PMAP;
651 666
652 /* 667 /*
653 * free EA 668 * free EA
654 */ 669 */
655 if (JFS_IP(ip)->ea.flag & DXD_EXTENT) 670 if (JFS_IP(ip)->ea.flag & DXD_EXTENT)
656 /* acquire maplock on EA to be 671 /* acquire maplock on EA to be freed from block map */
657 txEA(tid, ip, &JFS_IP(ip)->ea, 672 txEA(tid, ip, &JFS_IP(ip)->ea, NULL);
658 673
659 /* 674 /*
660 * free ACL 675 * free ACL
661 */ 676 */
662 if (JFS_IP(ip)->acl.flag & DXD_EXTENT) 677 if (JFS_IP(ip)->acl.flag & DXD_EXTENT)
663 /* acquire maplock on EA to be 678 /* acquire maplock on EA to be freed from block map */
664 txEA(tid, ip, &JFS_IP(ip)->acl 679 txEA(tid, ip, &JFS_IP(ip)->acl, NULL);
665 680
666 /* 681 /*
667 * free xtree/data (truncate to zero l 682 * free xtree/data (truncate to zero length):
668 * free xtree/data pages from cache if 683 * free xtree/data pages from cache if COMMIT_PWMAP,
669 * free xtree/data blocks from persist 684 * free xtree/data blocks from persistent block map, and
670 * free xtree/data blocks from working 685 * free xtree/data blocks from working block map if COMMIT_PWMAP;
671 */ 686 */
672 if (ip->i_size) 687 if (ip->i_size)
673 return xtTruncate_pmap(tid, ip 688 return xtTruncate_pmap(tid, ip, 0);
674 689
675 return 0; 690 return 0;
676 } 691 }
677 692
678 693
679 /* 694 /*
680 * NAME: jfs_free_zero_link() 695 * NAME: jfs_free_zero_link()
681 * 696 *
682 * FUNCTION: for non-directory, called by i 697 * FUNCTION: for non-directory, called by iClose(),
683 * free resources of a file from 698 * free resources of a file from cache and WORKING map
684 * for a file previously committe 699 * for a file previously committed with zero link count
685 * while associated with a pager 700 * while associated with a pager object,
686 * 701 *
687 * PARAMETER: ip - pointer to inode of 702 * PARAMETER: ip - pointer to inode of file.
688 */ 703 */
689 void jfs_free_zero_link(struct inode *ip) 704 void jfs_free_zero_link(struct inode *ip)
690 { 705 {
691 int type; 706 int type;
692 707
693 jfs_info("jfs_free_zero_link: ip = 0x% 708 jfs_info("jfs_free_zero_link: ip = 0x%p", ip);
694 709
695 /* return if not reg or symbolic link 710 /* return if not reg or symbolic link or if size is
696 * already ok. 711 * already ok.
697 */ 712 */
698 type = ip->i_mode & S_IFMT; 713 type = ip->i_mode & S_IFMT;
699 714
700 switch (type) { 715 switch (type) {
701 case S_IFREG: 716 case S_IFREG:
702 break; 717 break;
703 case S_IFLNK: 718 case S_IFLNK:
704 /* if its contained in inode n 719 /* if its contained in inode nothing to do */
705 if (ip->i_size < IDATASIZE) 720 if (ip->i_size < IDATASIZE)
706 return; 721 return;
707 break; 722 break;
708 default: 723 default:
709 return; 724 return;
710 } 725 }
711 726
712 /* 727 /*
713 * free EA 728 * free EA
714 */ 729 */
715 if (JFS_IP(ip)->ea.flag & DXD_EXTENT) 730 if (JFS_IP(ip)->ea.flag & DXD_EXTENT) {
716 s64 xaddr = addressDXD(&JFS_IP 731 s64 xaddr = addressDXD(&JFS_IP(ip)->ea);
717 int xlen = lengthDXD(&JFS_IP(i 732 int xlen = lengthDXD(&JFS_IP(ip)->ea);
718 struct maplock maplock; /* map 733 struct maplock maplock; /* maplock for COMMIT_WMAP */
719 struct pxd_lock *pxdlock; 734 struct pxd_lock *pxdlock; /* maplock for COMMIT_WMAP */
720 735
721 /* free EA pages from cache */ 736 /* free EA pages from cache */
722 invalidate_dxd_metapages(ip, J 737 invalidate_dxd_metapages(ip, JFS_IP(ip)->ea);
723 738
724 /* free EA extent from working 739 /* free EA extent from working block map */
725 maplock.index = 1; 740 maplock.index = 1;
726 pxdlock = (struct pxd_lock *) 741 pxdlock = (struct pxd_lock *) & maplock;
727 pxdlock->flag = mlckFREEPXD; 742 pxdlock->flag = mlckFREEPXD;
728 PXDaddress(&pxdlock->pxd, xadd 743 PXDaddress(&pxdlock->pxd, xaddr);
729 PXDlength(&pxdlock->pxd, xlen) 744 PXDlength(&pxdlock->pxd, xlen);
730 txFreeMap(ip, pxdlock, NULL, C 745 txFreeMap(ip, pxdlock, NULL, COMMIT_WMAP);
731 } 746 }
732 747
733 /* 748 /*
734 * free ACL 749 * free ACL
735 */ 750 */
736 if (JFS_IP(ip)->acl.flag & DXD_EXTENT) 751 if (JFS_IP(ip)->acl.flag & DXD_EXTENT) {
737 s64 xaddr = addressDXD(&JFS_IP 752 s64 xaddr = addressDXD(&JFS_IP(ip)->acl);
738 int xlen = lengthDXD(&JFS_IP(i 753 int xlen = lengthDXD(&JFS_IP(ip)->acl);
739 struct maplock maplock; /* map 754 struct maplock maplock; /* maplock for COMMIT_WMAP */
740 struct pxd_lock *pxdlock; 755 struct pxd_lock *pxdlock; /* maplock for COMMIT_WMAP */
741 756
742 invalidate_dxd_metapages(ip, J 757 invalidate_dxd_metapages(ip, JFS_IP(ip)->acl);
743 758
744 /* free ACL extent from workin 759 /* free ACL extent from working block map */
745 maplock.index = 1; 760 maplock.index = 1;
746 pxdlock = (struct pxd_lock *) 761 pxdlock = (struct pxd_lock *) & maplock;
747 pxdlock->flag = mlckFREEPXD; 762 pxdlock->flag = mlckFREEPXD;
748 PXDaddress(&pxdlock->pxd, xadd 763 PXDaddress(&pxdlock->pxd, xaddr);
749 PXDlength(&pxdlock->pxd, xlen) 764 PXDlength(&pxdlock->pxd, xlen);
750 txFreeMap(ip, pxdlock, NULL, C 765 txFreeMap(ip, pxdlock, NULL, COMMIT_WMAP);
751 } 766 }
752 767
753 /* 768 /*
754 * free xtree/data (truncate to zero l 769 * free xtree/data (truncate to zero length):
755 * free xtree/data pages from cache, a 770 * free xtree/data pages from cache, and
756 * free xtree/data blocks from working 771 * free xtree/data blocks from working block map;
757 */ 772 */
758 if (ip->i_size) 773 if (ip->i_size)
759 xtTruncate(0, ip, 0, COMMIT_WM 774 xtTruncate(0, ip, 0, COMMIT_WMAP);
760 } 775 }
761 776
762 /* 777 /*
763 * NAME: jfs_link(vp, dvp, name, crp) 778 * NAME: jfs_link(vp, dvp, name, crp)
764 * 779 *
765 * FUNCTION: create a link to <vp> by the n 780 * FUNCTION: create a link to <vp> by the name = <name>
766 * in the parent directory <dvp> 781 * in the parent directory <dvp>
767 * 782 *
768 * PARAMETER: vp - target object 783 * PARAMETER: vp - target object
769 * dvp - parent directory of 784 * dvp - parent directory of new link
770 * name - name of new link to 785 * name - name of new link to target object
771 * crp - credential 786 * crp - credential
772 * 787 *
773 * RETURN: Errors from subroutines 788 * RETURN: Errors from subroutines
774 * 789 *
775 * note: 790 * note:
776 * JFS does NOT support link() on directories 791 * JFS does NOT support link() on directories (to prevent circular
777 * path in the directory hierarchy); 792 * path in the directory hierarchy);
778 * EPERM: the target object is a directory, an 793 * EPERM: the target object is a directory, and either the caller
779 * does not have appropriate privileges or the 794 * does not have appropriate privileges or the implementation prohibits
780 * using link() on directories [XPG4.2]. 795 * using link() on directories [XPG4.2].
781 * 796 *
782 * JFS does NOT support links between file sys 797 * JFS does NOT support links between file systems:
783 * EXDEV: target object and new link are on di 798 * EXDEV: target object and new link are on different file systems and
784 * implementation does not support links betwe 799 * implementation does not support links between file systems [XPG4.2].
785 */ 800 */
786 static int jfs_link(struct dentry *old_dentry, 801 static int jfs_link(struct dentry *old_dentry,
787 struct inode *dir, struct dentry 802 struct inode *dir, struct dentry *dentry)
788 { 803 {
789 int rc; 804 int rc;
790 tid_t tid; 805 tid_t tid;
791 struct inode *ip = d_inode(old_dentry) 806 struct inode *ip = d_inode(old_dentry);
792 ino_t ino; 807 ino_t ino;
793 struct component_name dname; 808 struct component_name dname;
794 struct btstack btstack; 809 struct btstack btstack;
795 struct inode *iplist[2]; 810 struct inode *iplist[2];
796 811
797 jfs_info("jfs_link: %pd %pd", old_dent 812 jfs_info("jfs_link: %pd %pd", old_dentry, dentry);
798 813
799 rc = dquot_initialize(dir); 814 rc = dquot_initialize(dir);
800 if (rc) 815 if (rc)
801 goto out; 816 goto out;
802 817
803 if (isReadOnly(ip)) { <<
804 jfs_error(ip->i_sb, "read-only <<
805 return -EROFS; <<
806 } <<
807 <<
808 tid = txBegin(ip->i_sb, 0); 818 tid = txBegin(ip->i_sb, 0);
809 819
810 mutex_lock_nested(&JFS_IP(dir)->commit 820 mutex_lock_nested(&JFS_IP(dir)->commit_mutex, COMMIT_MUTEX_PARENT);
811 mutex_lock_nested(&JFS_IP(ip)->commit_ 821 mutex_lock_nested(&JFS_IP(ip)->commit_mutex, COMMIT_MUTEX_CHILD);
812 822
813 /* 823 /*
814 * scan parent directory for entry/fre 824 * scan parent directory for entry/freespace
815 */ 825 */
816 if ((rc = get_UCSname(&dname, dentry)) 826 if ((rc = get_UCSname(&dname, dentry)))
817 goto out_tx; 827 goto out_tx;
818 828
819 if ((rc = dtSearch(dir, &dname, &ino, 829 if ((rc = dtSearch(dir, &dname, &ino, &btstack, JFS_CREATE)))
820 goto free_dname; 830 goto free_dname;
821 831
822 /* 832 /*
823 * create entry for new link in parent 833 * create entry for new link in parent directory
824 */ 834 */
825 ino = ip->i_ino; 835 ino = ip->i_ino;
826 if ((rc = dtInsert(tid, dir, &dname, & 836 if ((rc = dtInsert(tid, dir, &dname, &ino, &btstack)))
827 goto free_dname; 837 goto free_dname;
828 838
829 /* update object inode */ 839 /* update object inode */
830 inc_nlink(ip); /* for new lin 840 inc_nlink(ip); /* for new link */
831 inode_set_ctime_current(ip); !! 841 ip->i_ctime = current_time(ip);
832 inode_set_mtime_to_ts(dir, inode_set_c !! 842 dir->i_ctime = dir->i_mtime = current_time(dir);
833 mark_inode_dirty(dir); 843 mark_inode_dirty(dir);
834 ihold(ip); 844 ihold(ip);
835 845
836 iplist[0] = ip; 846 iplist[0] = ip;
837 iplist[1] = dir; 847 iplist[1] = dir;
838 rc = txCommit(tid, 2, &iplist[0], 0); 848 rc = txCommit(tid, 2, &iplist[0], 0);
839 849
840 if (rc) { 850 if (rc) {
841 drop_nlink(ip); /* never insta 851 drop_nlink(ip); /* never instantiated */
842 iput(ip); 852 iput(ip);
843 } else 853 } else
844 d_instantiate(dentry, ip); 854 d_instantiate(dentry, ip);
845 855
846 free_dname: 856 free_dname:
847 free_UCSname(&dname); 857 free_UCSname(&dname);
848 858
849 out_tx: 859 out_tx:
850 txEnd(tid); 860 txEnd(tid);
851 861
852 mutex_unlock(&JFS_IP(ip)->commit_mutex 862 mutex_unlock(&JFS_IP(ip)->commit_mutex);
853 mutex_unlock(&JFS_IP(dir)->commit_mute 863 mutex_unlock(&JFS_IP(dir)->commit_mutex);
854 864
855 out: 865 out:
856 jfs_info("jfs_link: rc:%d", rc); 866 jfs_info("jfs_link: rc:%d", rc);
857 return rc; 867 return rc;
858 } 868 }
859 869
860 /* 870 /*
861 * NAME: jfs_symlink(dip, dentry, name) 871 * NAME: jfs_symlink(dip, dentry, name)
862 * 872 *
863 * FUNCTION: creates a symbolic link to <sy 873 * FUNCTION: creates a symbolic link to <symlink> by name <name>
864 * in directory <dip> 874 * in directory <dip>
865 * 875 *
866 * PARAMETER: dip - parent directory vno 876 * PARAMETER: dip - parent directory vnode
867 * dentry - dentry of symbolic l 877 * dentry - dentry of symbolic link
868 * name - the path name of the 878 * name - the path name of the existing object
869 * that will be the sou 879 * that will be the source of the link
870 * 880 *
871 * RETURN: errors from subroutines 881 * RETURN: errors from subroutines
872 * 882 *
873 * note: 883 * note:
874 * ENAMETOOLONG: pathname resolution of a symb 884 * ENAMETOOLONG: pathname resolution of a symbolic link produced
875 * an intermediate result whose length exceeds 885 * an intermediate result whose length exceeds PATH_MAX [XPG4.2]
876 */ 886 */
877 887
878 static int jfs_symlink(struct mnt_idmap *idmap !! 888 static int jfs_symlink(struct inode *dip, struct dentry *dentry,
879 struct dentry *dentry, !! 889 const char *name)
880 { 890 {
881 int rc; 891 int rc;
882 tid_t tid; 892 tid_t tid;
883 ino_t ino = 0; 893 ino_t ino = 0;
884 struct component_name dname; 894 struct component_name dname;
885 u32 ssize; /* source path !! 895 int ssize; /* source pathname size */
886 struct btstack btstack; 896 struct btstack btstack;
887 struct inode *ip; !! 897 struct inode *ip = d_inode(dentry);
888 s64 xlen = 0; 898 s64 xlen = 0;
889 int bmask = 0, xsize; 899 int bmask = 0, xsize;
890 s64 xaddr; 900 s64 xaddr;
891 struct metapage *mp; 901 struct metapage *mp;
892 struct super_block *sb; 902 struct super_block *sb;
893 struct tblock *tblk; 903 struct tblock *tblk;
894 904
895 struct inode *iplist[2]; 905 struct inode *iplist[2];
896 906
897 jfs_info("jfs_symlink: dip:0x%p name:% 907 jfs_info("jfs_symlink: dip:0x%p name:%s", dip, name);
898 908
899 rc = dquot_initialize(dip); 909 rc = dquot_initialize(dip);
900 if (rc) 910 if (rc)
901 goto out1; 911 goto out1;
902 912
903 ssize = strlen(name) + 1; 913 ssize = strlen(name) + 1;
904 914
905 /* 915 /*
906 * search parent directory for entry/f 916 * search parent directory for entry/freespace
907 * (dtSearch() returns parent director 917 * (dtSearch() returns parent directory page pinned)
908 */ 918 */
909 919
910 if ((rc = get_UCSname(&dname, dentry)) 920 if ((rc = get_UCSname(&dname, dentry)))
911 goto out1; 921 goto out1;
912 922
913 /* 923 /*
914 * allocate on-disk/in-memory inode fo 924 * allocate on-disk/in-memory inode for symbolic link:
915 * (iAlloc() returns new, locked inode 925 * (iAlloc() returns new, locked inode)
916 */ 926 */
917 ip = ialloc(dip, S_IFLNK | 0777); 927 ip = ialloc(dip, S_IFLNK | 0777);
918 if (IS_ERR(ip)) { 928 if (IS_ERR(ip)) {
919 rc = PTR_ERR(ip); 929 rc = PTR_ERR(ip);
920 goto out2; 930 goto out2;
921 } 931 }
922 932
923 tid = txBegin(dip->i_sb, 0); 933 tid = txBegin(dip->i_sb, 0);
924 934
925 mutex_lock_nested(&JFS_IP(dip)->commit 935 mutex_lock_nested(&JFS_IP(dip)->commit_mutex, COMMIT_MUTEX_PARENT);
926 mutex_lock_nested(&JFS_IP(ip)->commit_ 936 mutex_lock_nested(&JFS_IP(ip)->commit_mutex, COMMIT_MUTEX_CHILD);
927 937
928 rc = jfs_init_security(tid, ip, dip, & 938 rc = jfs_init_security(tid, ip, dip, &dentry->d_name);
929 if (rc) 939 if (rc)
930 goto out3; 940 goto out3;
931 941
932 tblk = tid_to_tblock(tid); 942 tblk = tid_to_tblock(tid);
933 tblk->xflag |= COMMIT_CREATE; 943 tblk->xflag |= COMMIT_CREATE;
934 tblk->ino = ip->i_ino; 944 tblk->ino = ip->i_ino;
935 tblk->u.ixpxd = JFS_IP(ip)->ixpxd; 945 tblk->u.ixpxd = JFS_IP(ip)->ixpxd;
936 946
937 /* fix symlink access permission 947 /* fix symlink access permission
938 * (dir_create() ANDs in the u.u_cmask 948 * (dir_create() ANDs in the u.u_cmask,
939 * but symlinks really need to be 777 949 * but symlinks really need to be 777 access)
940 */ 950 */
941 ip->i_mode |= 0777; 951 ip->i_mode |= 0777;
942 952
943 /* 953 /*
944 * write symbolic link target path nam 954 * write symbolic link target path name
945 */ 955 */
946 xtInitRoot(tid, ip); 956 xtInitRoot(tid, ip);
947 957
948 /* 958 /*
949 * write source path name inline in on 959 * write source path name inline in on-disk inode (fast symbolic link)
950 */ 960 */
951 961
952 if (ssize <= IDATASIZE) { 962 if (ssize <= IDATASIZE) {
953 ip->i_op = &jfs_fast_symlink_i 963 ip->i_op = &jfs_fast_symlink_inode_operations;
954 964
955 ip->i_link = JFS_IP(ip)->i_inl !! 965 ip->i_link = JFS_IP(ip)->i_inline;
956 memcpy(ip->i_link, name, ssize 966 memcpy(ip->i_link, name, ssize);
957 ip->i_size = ssize - 1; 967 ip->i_size = ssize - 1;
958 968
959 /* 969 /*
960 * if symlink is > 128 bytes, 970 * if symlink is > 128 bytes, we don't have the space to
961 * store inline extended attri 971 * store inline extended attributes
962 */ 972 */
963 if (ssize > sizeof (JFS_IP(ip) 973 if (ssize > sizeof (JFS_IP(ip)->i_inline))
964 JFS_IP(ip)->mode2 &= ~ 974 JFS_IP(ip)->mode2 &= ~INLINEEA;
965 975
966 jfs_info("jfs_symlink: fast sy !! 976 jfs_info("jfs_symlink: fast symlink added ssize:%d name:%s ",
967 ssize, name); 977 ssize, name);
968 } 978 }
969 /* 979 /*
970 * write source path name in a single 980 * write source path name in a single extent
971 */ 981 */
972 else { 982 else {
973 jfs_info("jfs_symlink: allocat 983 jfs_info("jfs_symlink: allocate extent ip:0x%p", ip);
974 984
975 ip->i_op = &jfs_symlink_inode_ 985 ip->i_op = &jfs_symlink_inode_operations;
976 inode_nohighmem(ip); 986 inode_nohighmem(ip);
977 ip->i_mapping->a_ops = &jfs_ao 987 ip->i_mapping->a_ops = &jfs_aops;
978 988
979 /* 989 /*
980 * even though the data of sym 990 * even though the data of symlink object (source
981 * path name) is treated as no 991 * path name) is treated as non-journaled user data,
982 * it is read/written thru buf 992 * it is read/written thru buffer cache for performance.
983 */ 993 */
984 sb = ip->i_sb; 994 sb = ip->i_sb;
985 bmask = JFS_SBI(sb)->bsize - 1 995 bmask = JFS_SBI(sb)->bsize - 1;
986 xsize = (ssize + bmask) & ~bma 996 xsize = (ssize + bmask) & ~bmask;
987 xaddr = 0; 997 xaddr = 0;
988 xlen = xsize >> JFS_SBI(sb)->l 998 xlen = xsize >> JFS_SBI(sb)->l2bsize;
989 if ((rc = xtInsert(tid, ip, 0, 999 if ((rc = xtInsert(tid, ip, 0, 0, xlen, &xaddr, 0))) {
990 txAbort(tid, 0); 1000 txAbort(tid, 0);
991 goto out3; 1001 goto out3;
992 } 1002 }
993 ip->i_size = ssize - 1; 1003 ip->i_size = ssize - 1;
994 while (ssize) { 1004 while (ssize) {
995 /* This is kind of sil 1005 /* This is kind of silly since PATH_MAX == 4K */
996 u32 copy_size = min_t( !! 1006 int copy_size = min(ssize, PSIZE);
997 1007
998 mp = get_metapage(ip, 1008 mp = get_metapage(ip, xaddr, PSIZE, 1);
999 1009
1000 if (mp == NULL) { 1010 if (mp == NULL) {
1001 xtTruncate(ti 1011 xtTruncate(tid, ip, 0, COMMIT_PWMAP);
1002 rc = -EIO; 1012 rc = -EIO;
1003 txAbort(tid, 1013 txAbort(tid, 0);
1004 goto out3; 1014 goto out3;
1005 } 1015 }
1006 memcpy(mp->data, name 1016 memcpy(mp->data, name, copy_size);
1007 flush_metapage(mp); 1017 flush_metapage(mp);
1008 ssize -= copy_size; 1018 ssize -= copy_size;
1009 name += copy_size; 1019 name += copy_size;
1010 xaddr += JFS_SBI(sb)- 1020 xaddr += JFS_SBI(sb)->nbperpage;
1011 } 1021 }
1012 } 1022 }
1013 1023
1014 /* 1024 /*
1015 * create entry for symbolic link in 1025 * create entry for symbolic link in parent directory
1016 */ 1026 */
1017 rc = dtSearch(dip, &dname, &ino, &bts 1027 rc = dtSearch(dip, &dname, &ino, &btstack, JFS_CREATE);
1018 if (rc == 0) { 1028 if (rc == 0) {
1019 ino = ip->i_ino; 1029 ino = ip->i_ino;
1020 rc = dtInsert(tid, dip, &dnam 1030 rc = dtInsert(tid, dip, &dname, &ino, &btstack);
1021 } 1031 }
1022 if (rc) { 1032 if (rc) {
1023 if (xlen) 1033 if (xlen)
1024 xtTruncate(tid, ip, 0 1034 xtTruncate(tid, ip, 0, COMMIT_PWMAP);
1025 txAbort(tid, 0); 1035 txAbort(tid, 0);
1026 /* discard new inode */ 1036 /* discard new inode */
1027 goto out3; 1037 goto out3;
1028 } 1038 }
1029 1039
1030 mark_inode_dirty(ip); 1040 mark_inode_dirty(ip);
1031 1041
1032 inode_set_mtime_to_ts(dip, inode_set_ !! 1042 dip->i_ctime = dip->i_mtime = current_time(dip);
1033 mark_inode_dirty(dip); 1043 mark_inode_dirty(dip);
1034 /* 1044 /*
1035 * commit update of parent directory 1045 * commit update of parent directory and link object
1036 */ 1046 */
1037 1047
1038 iplist[0] = dip; 1048 iplist[0] = dip;
1039 iplist[1] = ip; 1049 iplist[1] = ip;
1040 rc = txCommit(tid, 2, &iplist[0], 0); 1050 rc = txCommit(tid, 2, &iplist[0], 0);
1041 1051
1042 out3: 1052 out3:
1043 txEnd(tid); 1053 txEnd(tid);
1044 mutex_unlock(&JFS_IP(ip)->commit_mute 1054 mutex_unlock(&JFS_IP(ip)->commit_mutex);
1045 mutex_unlock(&JFS_IP(dip)->commit_mut 1055 mutex_unlock(&JFS_IP(dip)->commit_mutex);
1046 if (rc) { 1056 if (rc) {
1047 free_ea_wmap(ip); 1057 free_ea_wmap(ip);
1048 clear_nlink(ip); 1058 clear_nlink(ip);
1049 discard_new_inode(ip); !! 1059 unlock_new_inode(ip);
>> 1060 iput(ip);
1050 } else { 1061 } else {
1051 d_instantiate_new(dentry, ip) !! 1062 unlock_new_inode(ip);
>> 1063 d_instantiate(dentry, ip);
1052 } 1064 }
1053 1065
1054 out2: 1066 out2:
1055 free_UCSname(&dname); 1067 free_UCSname(&dname);
1056 1068
1057 out1: 1069 out1:
1058 jfs_info("jfs_symlink: rc:%d", rc); 1070 jfs_info("jfs_symlink: rc:%d", rc);
1059 return rc; 1071 return rc;
1060 } 1072 }
1061 1073
1062 1074
1063 /* 1075 /*
1064 * NAME: jfs_rename 1076 * NAME: jfs_rename
1065 * 1077 *
1066 * FUNCTION: rename a file or directory 1078 * FUNCTION: rename a file or directory
1067 */ 1079 */
1068 static int jfs_rename(struct mnt_idmap *idmap !! 1080 static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
1069 struct dentry *old_dent !! 1081 struct inode *new_dir, struct dentry *new_dentry,
1070 struct dentry *new_dent !! 1082 unsigned int flags)
1071 { 1083 {
1072 struct btstack btstack; 1084 struct btstack btstack;
1073 ino_t ino; 1085 ino_t ino;
1074 struct component_name new_dname; 1086 struct component_name new_dname;
1075 struct inode *new_ip; 1087 struct inode *new_ip;
1076 struct component_name old_dname; 1088 struct component_name old_dname;
1077 struct inode *old_ip; 1089 struct inode *old_ip;
1078 int rc; 1090 int rc;
1079 tid_t tid; 1091 tid_t tid;
1080 struct tlock *tlck; 1092 struct tlock *tlck;
1081 struct dt_lock *dtlck; 1093 struct dt_lock *dtlck;
1082 struct lv *lv; 1094 struct lv *lv;
1083 int ipcount; 1095 int ipcount;
1084 struct inode *iplist[4]; 1096 struct inode *iplist[4];
1085 struct tblock *tblk; 1097 struct tblock *tblk;
1086 s64 new_size = 0; 1098 s64 new_size = 0;
1087 int commit_flag; 1099 int commit_flag;
1088 1100
1089 if (flags & ~RENAME_NOREPLACE) 1101 if (flags & ~RENAME_NOREPLACE)
1090 return -EINVAL; 1102 return -EINVAL;
1091 1103
1092 jfs_info("jfs_rename: %pd %pd", old_d 1104 jfs_info("jfs_rename: %pd %pd", old_dentry, new_dentry);
1093 1105
1094 rc = dquot_initialize(old_dir); 1106 rc = dquot_initialize(old_dir);
1095 if (rc) 1107 if (rc)
1096 goto out1; 1108 goto out1;
1097 rc = dquot_initialize(new_dir); 1109 rc = dquot_initialize(new_dir);
1098 if (rc) 1110 if (rc)
1099 goto out1; 1111 goto out1;
1100 1112
1101 old_ip = d_inode(old_dentry); 1113 old_ip = d_inode(old_dentry);
1102 new_ip = d_inode(new_dentry); 1114 new_ip = d_inode(new_dentry);
1103 1115
1104 if ((rc = get_UCSname(&old_dname, old 1116 if ((rc = get_UCSname(&old_dname, old_dentry)))
1105 goto out1; 1117 goto out1;
1106 1118
1107 if ((rc = get_UCSname(&new_dname, new 1119 if ((rc = get_UCSname(&new_dname, new_dentry)))
1108 goto out2; 1120 goto out2;
1109 1121
1110 /* 1122 /*
1111 * Make sure source inode number is w 1123 * Make sure source inode number is what we think it is
1112 */ 1124 */
1113 rc = dtSearch(old_dir, &old_dname, &i 1125 rc = dtSearch(old_dir, &old_dname, &ino, &btstack, JFS_LOOKUP);
1114 if (rc || (ino != old_ip->i_ino)) { 1126 if (rc || (ino != old_ip->i_ino)) {
1115 rc = -ENOENT; 1127 rc = -ENOENT;
1116 goto out3; 1128 goto out3;
1117 } 1129 }
1118 1130
1119 /* 1131 /*
1120 * Make sure dest inode number (if an 1132 * Make sure dest inode number (if any) is what we think it is
1121 */ 1133 */
1122 rc = dtSearch(new_dir, &new_dname, &i 1134 rc = dtSearch(new_dir, &new_dname, &ino, &btstack, JFS_LOOKUP);
1123 if (!rc) { 1135 if (!rc) {
1124 if ((!new_ip) || (ino != new_ 1136 if ((!new_ip) || (ino != new_ip->i_ino)) {
1125 rc = -ESTALE; 1137 rc = -ESTALE;
1126 goto out3; 1138 goto out3;
1127 } 1139 }
1128 } else if (rc != -ENOENT) 1140 } else if (rc != -ENOENT)
1129 goto out3; 1141 goto out3;
1130 else if (new_ip) { 1142 else if (new_ip) {
1131 /* no entry exists, but one w 1143 /* no entry exists, but one was expected */
1132 rc = -ESTALE; 1144 rc = -ESTALE;
1133 goto out3; 1145 goto out3;
1134 } 1146 }
1135 1147
1136 if (S_ISDIR(old_ip->i_mode)) { 1148 if (S_ISDIR(old_ip->i_mode)) {
1137 if (new_ip) { 1149 if (new_ip) {
1138 if (!dtEmpty(new_ip)) 1150 if (!dtEmpty(new_ip)) {
1139 rc = -ENOTEMP 1151 rc = -ENOTEMPTY;
1140 goto out3; 1152 goto out3;
1141 } 1153 }
1142 } 1154 }
1143 } else if (new_ip) { 1155 } else if (new_ip) {
1144 IWRITE_LOCK(new_ip, RDWRLOCK_ 1156 IWRITE_LOCK(new_ip, RDWRLOCK_NORMAL);
1145 /* Init inode for quota opera 1157 /* Init inode for quota operations. */
1146 rc = dquot_initialize(new_ip) 1158 rc = dquot_initialize(new_ip);
1147 if (rc) 1159 if (rc)
1148 goto out_unlock; 1160 goto out_unlock;
1149 } 1161 }
1150 1162
1151 /* 1163 /*
1152 * The real work starts here 1164 * The real work starts here
1153 */ 1165 */
1154 tid = txBegin(new_dir->i_sb, 0); 1166 tid = txBegin(new_dir->i_sb, 0);
1155 1167
1156 /* 1168 /*
1157 * How do we know the locking is safe 1169 * How do we know the locking is safe from deadlocks?
1158 * The vfs does the hard part for us. 1170 * The vfs does the hard part for us. Any time we are taking nested
1159 * commit_mutexes, the vfs already ha 1171 * commit_mutexes, the vfs already has i_mutex held on the parent.
1160 * Here, the vfs has already taken i_ 1172 * Here, the vfs has already taken i_mutex on both old_dir and new_dir.
1161 */ 1173 */
1162 mutex_lock_nested(&JFS_IP(new_dir)->c 1174 mutex_lock_nested(&JFS_IP(new_dir)->commit_mutex, COMMIT_MUTEX_PARENT);
1163 mutex_lock_nested(&JFS_IP(old_ip)->co 1175 mutex_lock_nested(&JFS_IP(old_ip)->commit_mutex, COMMIT_MUTEX_CHILD);
1164 if (old_dir != new_dir) 1176 if (old_dir != new_dir)
1165 mutex_lock_nested(&JFS_IP(old 1177 mutex_lock_nested(&JFS_IP(old_dir)->commit_mutex,
1166 COMMIT_MUTE 1178 COMMIT_MUTEX_SECOND_PARENT);
1167 1179
1168 if (new_ip) { 1180 if (new_ip) {
1169 mutex_lock_nested(&JFS_IP(new 1181 mutex_lock_nested(&JFS_IP(new_ip)->commit_mutex,
1170 COMMIT_MUTE 1182 COMMIT_MUTEX_VICTIM);
1171 /* 1183 /*
1172 * Change existing directory 1184 * Change existing directory entry to new inode number
1173 */ 1185 */
1174 ino = new_ip->i_ino; 1186 ino = new_ip->i_ino;
1175 rc = dtModify(tid, new_dir, & 1187 rc = dtModify(tid, new_dir, &new_dname, &ino,
1176 old_ip->i_ino, 1188 old_ip->i_ino, JFS_RENAME);
1177 if (rc) 1189 if (rc)
1178 goto out_tx; 1190 goto out_tx;
1179 drop_nlink(new_ip); 1191 drop_nlink(new_ip);
1180 if (S_ISDIR(new_ip->i_mode)) 1192 if (S_ISDIR(new_ip->i_mode)) {
1181 drop_nlink(new_ip); 1193 drop_nlink(new_ip);
1182 if (new_ip->i_nlink) 1194 if (new_ip->i_nlink) {
1183 mutex_unlock( 1195 mutex_unlock(&JFS_IP(new_ip)->commit_mutex);
1184 if (old_dir ! 1196 if (old_dir != new_dir)
1185 mutex 1197 mutex_unlock(&JFS_IP(old_dir)->commit_mutex);
1186 mutex_unlock( 1198 mutex_unlock(&JFS_IP(old_ip)->commit_mutex);
1187 mutex_unlock( 1199 mutex_unlock(&JFS_IP(new_dir)->commit_mutex);
1188 if (!S_ISDIR( 1200 if (!S_ISDIR(old_ip->i_mode) && new_ip)
1189 IWRIT 1201 IWRITE_UNLOCK(new_ip);
1190 jfs_error(new 1202 jfs_error(new_ip->i_sb,
1191 "ne 1203 "new_ip->i_nlink != 0\n");
1192 return -EIO; 1204 return -EIO;
1193 } 1205 }
1194 tblk = tid_to_tblock( 1206 tblk = tid_to_tblock(tid);
1195 tblk->xflag |= COMMIT 1207 tblk->xflag |= COMMIT_DELETE;
1196 tblk->u.ip = new_ip; 1208 tblk->u.ip = new_ip;
1197 } else if (new_ip->i_nlink == 1209 } else if (new_ip->i_nlink == 0) {
1198 assert(!test_cflag(CO 1210 assert(!test_cflag(COMMIT_Nolink, new_ip));
1199 /* free block resourc 1211 /* free block resources */
1200 if ((new_size = commi 1212 if ((new_size = commitZeroLink(tid, new_ip)) < 0) {
1201 txAbort(tid, 1213 txAbort(tid, 1); /* Marks FS Dirty */
1202 rc = new_size 1214 rc = new_size;
1203 goto out_tx; 1215 goto out_tx;
1204 } 1216 }
1205 tblk = tid_to_tblock( 1217 tblk = tid_to_tblock(tid);
1206 tblk->xflag |= COMMIT 1218 tblk->xflag |= COMMIT_DELETE;
1207 tblk->u.ip = new_ip; 1219 tblk->u.ip = new_ip;
1208 } else { 1220 } else {
1209 inode_set_ctime_curre !! 1221 new_ip->i_ctime = current_time(new_ip);
1210 mark_inode_dirty(new_ 1222 mark_inode_dirty(new_ip);
1211 } 1223 }
1212 } else { 1224 } else {
1213 /* 1225 /*
1214 * Add new directory entry 1226 * Add new directory entry
1215 */ 1227 */
1216 rc = dtSearch(new_dir, &new_d 1228 rc = dtSearch(new_dir, &new_dname, &ino, &btstack,
1217 JFS_CREATE); 1229 JFS_CREATE);
1218 if (rc) { 1230 if (rc) {
1219 jfs_err("jfs_rename d 1231 jfs_err("jfs_rename didn't expect dtSearch to fail w/rc = %d",
1220 rc); 1232 rc);
1221 goto out_tx; 1233 goto out_tx;
1222 } 1234 }
1223 1235
1224 ino = old_ip->i_ino; 1236 ino = old_ip->i_ino;
1225 rc = dtInsert(tid, new_dir, & 1237 rc = dtInsert(tid, new_dir, &new_dname, &ino, &btstack);
1226 if (rc) { 1238 if (rc) {
1227 if (rc == -EIO) 1239 if (rc == -EIO)
1228 jfs_err("jfs_ 1240 jfs_err("jfs_rename: dtInsert returned -EIO");
1229 goto out_tx; 1241 goto out_tx;
1230 } 1242 }
1231 if (S_ISDIR(old_ip->i_mode)) 1243 if (S_ISDIR(old_ip->i_mode))
1232 inc_nlink(new_dir); 1244 inc_nlink(new_dir);
1233 } 1245 }
1234 /* 1246 /*
1235 * Remove old directory entry 1247 * Remove old directory entry
1236 */ 1248 */
1237 1249
1238 ino = old_ip->i_ino; 1250 ino = old_ip->i_ino;
1239 rc = dtDelete(tid, old_dir, &old_dnam 1251 rc = dtDelete(tid, old_dir, &old_dname, &ino, JFS_REMOVE);
1240 if (rc) { 1252 if (rc) {
1241 jfs_err("jfs_rename did not e 1253 jfs_err("jfs_rename did not expect dtDelete to return rc = %d",
1242 rc); 1254 rc);
1243 txAbort(tid, 1); /* Ma 1255 txAbort(tid, 1); /* Marks Filesystem dirty */
1244 goto out_tx; 1256 goto out_tx;
1245 } 1257 }
1246 if (S_ISDIR(old_ip->i_mode)) { 1258 if (S_ISDIR(old_ip->i_mode)) {
1247 drop_nlink(old_dir); 1259 drop_nlink(old_dir);
1248 if (old_dir != new_dir) { 1260 if (old_dir != new_dir) {
1249 /* 1261 /*
1250 * Change inode numbe 1262 * Change inode number of parent for moved directory
1251 */ 1263 */
1252 1264
1253 JFS_IP(old_ip)->i_dtr 1265 JFS_IP(old_ip)->i_dtroot.header.idotdot =
1254 cpu_to_le32(n 1266 cpu_to_le32(new_dir->i_ino);
1255 1267
1256 /* Linelock header of 1268 /* Linelock header of dtree */
1257 tlck = txLock(tid, ol 1269 tlck = txLock(tid, old_ip,
1258 (struct m 1270 (struct metapage *) &JFS_IP(old_ip)->bxflag,
1259 tlckDTR 1271 tlckDTREE | tlckBTROOT | tlckRELINK);
1260 dtlck = (struct dt_lo 1272 dtlck = (struct dt_lock *) & tlck->lock;
1261 ASSERT(dtlck->index = 1273 ASSERT(dtlck->index == 0);
1262 lv = & dtlck->lv[0]; 1274 lv = & dtlck->lv[0];
1263 lv->offset = 0; 1275 lv->offset = 0;
1264 lv->length = 1; 1276 lv->length = 1;
1265 dtlck->index++; 1277 dtlck->index++;
1266 } 1278 }
1267 } 1279 }
1268 1280
1269 /* 1281 /*
1270 * Update ctime on changed/moved inod 1282 * Update ctime on changed/moved inodes & mark dirty
1271 */ 1283 */
1272 inode_set_ctime_current(old_ip); !! 1284 old_ip->i_ctime = current_time(old_ip);
1273 mark_inode_dirty(old_ip); 1285 mark_inode_dirty(old_ip);
1274 1286
1275 inode_set_mtime_to_ts(new_dir, inode_ !! 1287 new_dir->i_ctime = new_dir->i_mtime = current_time(new_dir);
1276 mark_inode_dirty(new_dir); 1288 mark_inode_dirty(new_dir);
1277 1289
1278 /* Build list of inodes modified by t 1290 /* Build list of inodes modified by this transaction */
1279 ipcount = 0; 1291 ipcount = 0;
1280 iplist[ipcount++] = old_ip; 1292 iplist[ipcount++] = old_ip;
1281 if (new_ip) 1293 if (new_ip)
1282 iplist[ipcount++] = new_ip; 1294 iplist[ipcount++] = new_ip;
1283 iplist[ipcount++] = old_dir; 1295 iplist[ipcount++] = old_dir;
1284 1296
1285 if (old_dir != new_dir) { 1297 if (old_dir != new_dir) {
1286 iplist[ipcount++] = new_dir; 1298 iplist[ipcount++] = new_dir;
1287 inode_set_mtime_to_ts(old_dir !! 1299 old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir);
1288 inode_s <<
1289 mark_inode_dirty(old_dir); 1300 mark_inode_dirty(old_dir);
1290 } 1301 }
1291 1302
1292 /* 1303 /*
1293 * Incomplete truncate of file data c 1304 * Incomplete truncate of file data can
1294 * result in timing problems unless w 1305 * result in timing problems unless we synchronously commit the
1295 * transaction. 1306 * transaction.
1296 */ 1307 */
1297 if (new_size) 1308 if (new_size)
1298 commit_flag = COMMIT_SYNC; 1309 commit_flag = COMMIT_SYNC;
1299 else 1310 else
1300 commit_flag = 0; 1311 commit_flag = 0;
1301 1312
1302 rc = txCommit(tid, ipcount, iplist, c 1313 rc = txCommit(tid, ipcount, iplist, commit_flag);
1303 1314
1304 out_tx: 1315 out_tx:
1305 txEnd(tid); 1316 txEnd(tid);
1306 if (new_ip) 1317 if (new_ip)
1307 mutex_unlock(&JFS_IP(new_ip)- 1318 mutex_unlock(&JFS_IP(new_ip)->commit_mutex);
1308 if (old_dir != new_dir) 1319 if (old_dir != new_dir)
1309 mutex_unlock(&JFS_IP(old_dir) 1320 mutex_unlock(&JFS_IP(old_dir)->commit_mutex);
1310 mutex_unlock(&JFS_IP(old_ip)->commit_ 1321 mutex_unlock(&JFS_IP(old_ip)->commit_mutex);
1311 mutex_unlock(&JFS_IP(new_dir)->commit 1322 mutex_unlock(&JFS_IP(new_dir)->commit_mutex);
1312 1323
1313 while (new_size && (rc == 0)) { 1324 while (new_size && (rc == 0)) {
1314 tid = txBegin(new_ip->i_sb, 0 1325 tid = txBegin(new_ip->i_sb, 0);
1315 mutex_lock(&JFS_IP(new_ip)->c 1326 mutex_lock(&JFS_IP(new_ip)->commit_mutex);
1316 new_size = xtTruncate_pmap(ti 1327 new_size = xtTruncate_pmap(tid, new_ip, new_size);
1317 if (new_size < 0) { 1328 if (new_size < 0) {
1318 txAbort(tid, 1); 1329 txAbort(tid, 1);
1319 rc = new_size; 1330 rc = new_size;
1320 } else 1331 } else
1321 rc = txCommit(tid, 1, 1332 rc = txCommit(tid, 1, &new_ip, COMMIT_SYNC);
1322 txEnd(tid); 1333 txEnd(tid);
1323 mutex_unlock(&JFS_IP(new_ip)- 1334 mutex_unlock(&JFS_IP(new_ip)->commit_mutex);
1324 } 1335 }
1325 if (new_ip && (new_ip->i_nlink == 0)) 1336 if (new_ip && (new_ip->i_nlink == 0))
1326 set_cflag(COMMIT_Nolink, new_ 1337 set_cflag(COMMIT_Nolink, new_ip);
1327 /* 1338 /*
1328 * Truncating the directory index tab 1339 * Truncating the directory index table is not guaranteed. It
1329 * may need to be done iteratively 1340 * may need to be done iteratively
1330 */ 1341 */
1331 if (test_cflag(COMMIT_Stale, old_dir) 1342 if (test_cflag(COMMIT_Stale, old_dir)) {
1332 if (old_dir->i_size > 1) 1343 if (old_dir->i_size > 1)
1333 jfs_truncate_nolock(o 1344 jfs_truncate_nolock(old_dir, 0);
1334 1345
1335 clear_cflag(COMMIT_Stale, old 1346 clear_cflag(COMMIT_Stale, old_dir);
1336 } 1347 }
1337 out_unlock: 1348 out_unlock:
1338 if (new_ip && !S_ISDIR(new_ip->i_mode 1349 if (new_ip && !S_ISDIR(new_ip->i_mode))
1339 IWRITE_UNLOCK(new_ip); 1350 IWRITE_UNLOCK(new_ip);
1340 out3: 1351 out3:
1341 free_UCSname(&new_dname); 1352 free_UCSname(&new_dname);
1342 out2: 1353 out2:
1343 free_UCSname(&old_dname); 1354 free_UCSname(&old_dname);
1344 out1: 1355 out1:
1345 jfs_info("jfs_rename: returning %d", 1356 jfs_info("jfs_rename: returning %d", rc);
1346 return rc; 1357 return rc;
1347 } 1358 }
1348 1359
1349 1360
1350 /* 1361 /*
1351 * NAME: jfs_mknod 1362 * NAME: jfs_mknod
1352 * 1363 *
1353 * FUNCTION: Create a special file (device 1364 * FUNCTION: Create a special file (device)
1354 */ 1365 */
1355 static int jfs_mknod(struct mnt_idmap *idmap, !! 1366 static int jfs_mknod(struct inode *dir, struct dentry *dentry,
1356 struct dentry *dentry, u !! 1367 umode_t mode, dev_t rdev)
1357 { 1368 {
1358 struct jfs_inode_info *jfs_ip; 1369 struct jfs_inode_info *jfs_ip;
1359 struct btstack btstack; 1370 struct btstack btstack;
1360 struct component_name dname; 1371 struct component_name dname;
1361 ino_t ino; 1372 ino_t ino;
1362 struct inode *ip; 1373 struct inode *ip;
1363 struct inode *iplist[2]; 1374 struct inode *iplist[2];
1364 int rc; 1375 int rc;
1365 tid_t tid; 1376 tid_t tid;
1366 struct tblock *tblk; 1377 struct tblock *tblk;
1367 1378
1368 jfs_info("jfs_mknod: %pd", dentry); 1379 jfs_info("jfs_mknod: %pd", dentry);
1369 1380
1370 rc = dquot_initialize(dir); 1381 rc = dquot_initialize(dir);
1371 if (rc) 1382 if (rc)
1372 goto out; 1383 goto out;
1373 1384
1374 if ((rc = get_UCSname(&dname, dentry) 1385 if ((rc = get_UCSname(&dname, dentry)))
1375 goto out; 1386 goto out;
1376 1387
1377 ip = ialloc(dir, mode); 1388 ip = ialloc(dir, mode);
1378 if (IS_ERR(ip)) { 1389 if (IS_ERR(ip)) {
1379 rc = PTR_ERR(ip); 1390 rc = PTR_ERR(ip);
1380 goto out1; 1391 goto out1;
1381 } 1392 }
1382 jfs_ip = JFS_IP(ip); 1393 jfs_ip = JFS_IP(ip);
1383 1394
1384 tid = txBegin(dir->i_sb, 0); 1395 tid = txBegin(dir->i_sb, 0);
1385 1396
1386 mutex_lock_nested(&JFS_IP(dir)->commi 1397 mutex_lock_nested(&JFS_IP(dir)->commit_mutex, COMMIT_MUTEX_PARENT);
1387 mutex_lock_nested(&JFS_IP(ip)->commit 1398 mutex_lock_nested(&JFS_IP(ip)->commit_mutex, COMMIT_MUTEX_CHILD);
1388 1399
1389 rc = jfs_init_acl(tid, ip, dir); 1400 rc = jfs_init_acl(tid, ip, dir);
1390 if (rc) 1401 if (rc)
1391 goto out3; 1402 goto out3;
1392 1403
1393 rc = jfs_init_security(tid, ip, dir, 1404 rc = jfs_init_security(tid, ip, dir, &dentry->d_name);
1394 if (rc) { 1405 if (rc) {
1395 txAbort(tid, 0); 1406 txAbort(tid, 0);
1396 goto out3; 1407 goto out3;
1397 } 1408 }
1398 1409
1399 if ((rc = dtSearch(dir, &dname, &ino, 1410 if ((rc = dtSearch(dir, &dname, &ino, &btstack, JFS_CREATE))) {
1400 txAbort(tid, 0); 1411 txAbort(tid, 0);
1401 goto out3; 1412 goto out3;
1402 } 1413 }
1403 1414
1404 tblk = tid_to_tblock(tid); 1415 tblk = tid_to_tblock(tid);
1405 tblk->xflag |= COMMIT_CREATE; 1416 tblk->xflag |= COMMIT_CREATE;
1406 tblk->ino = ip->i_ino; 1417 tblk->ino = ip->i_ino;
1407 tblk->u.ixpxd = JFS_IP(ip)->ixpxd; 1418 tblk->u.ixpxd = JFS_IP(ip)->ixpxd;
1408 1419
1409 ino = ip->i_ino; 1420 ino = ip->i_ino;
1410 if ((rc = dtInsert(tid, dir, &dname, 1421 if ((rc = dtInsert(tid, dir, &dname, &ino, &btstack))) {
1411 txAbort(tid, 0); 1422 txAbort(tid, 0);
1412 goto out3; 1423 goto out3;
1413 } 1424 }
1414 1425
1415 ip->i_op = &jfs_file_inode_operations 1426 ip->i_op = &jfs_file_inode_operations;
1416 jfs_ip->dev = new_encode_dev(rdev); 1427 jfs_ip->dev = new_encode_dev(rdev);
1417 init_special_inode(ip, ip->i_mode, rd 1428 init_special_inode(ip, ip->i_mode, rdev);
1418 1429
1419 mark_inode_dirty(ip); 1430 mark_inode_dirty(ip);
1420 1431
1421 inode_set_mtime_to_ts(dir, inode_set_ !! 1432 dir->i_ctime = dir->i_mtime = current_time(dir);
1422 1433
1423 mark_inode_dirty(dir); 1434 mark_inode_dirty(dir);
1424 1435
1425 iplist[0] = dir; 1436 iplist[0] = dir;
1426 iplist[1] = ip; 1437 iplist[1] = ip;
1427 rc = txCommit(tid, 2, iplist, 0); 1438 rc = txCommit(tid, 2, iplist, 0);
1428 1439
1429 out3: 1440 out3:
1430 txEnd(tid); 1441 txEnd(tid);
1431 mutex_unlock(&JFS_IP(ip)->commit_mute 1442 mutex_unlock(&JFS_IP(ip)->commit_mutex);
1432 mutex_unlock(&JFS_IP(dir)->commit_mut 1443 mutex_unlock(&JFS_IP(dir)->commit_mutex);
1433 if (rc) { 1444 if (rc) {
1434 free_ea_wmap(ip); 1445 free_ea_wmap(ip);
1435 clear_nlink(ip); 1446 clear_nlink(ip);
1436 discard_new_inode(ip); !! 1447 unlock_new_inode(ip);
>> 1448 iput(ip);
1437 } else { 1449 } else {
1438 d_instantiate_new(dentry, ip) !! 1450 unlock_new_inode(ip);
>> 1451 d_instantiate(dentry, ip);
1439 } 1452 }
1440 1453
1441 out1: 1454 out1:
1442 free_UCSname(&dname); 1455 free_UCSname(&dname);
1443 1456
1444 out: 1457 out:
1445 jfs_info("jfs_mknod: returning %d", r 1458 jfs_info("jfs_mknod: returning %d", rc);
1446 return rc; 1459 return rc;
1447 } 1460 }
1448 1461
1449 static struct dentry *jfs_lookup(struct inode 1462 static struct dentry *jfs_lookup(struct inode *dip, struct dentry *dentry, unsigned int flags)
1450 { 1463 {
1451 struct btstack btstack; 1464 struct btstack btstack;
1452 ino_t inum; 1465 ino_t inum;
1453 struct inode *ip; 1466 struct inode *ip;
1454 struct component_name key; 1467 struct component_name key;
1455 int rc; 1468 int rc;
1456 1469
1457 jfs_info("jfs_lookup: name = %pd", de 1470 jfs_info("jfs_lookup: name = %pd", dentry);
1458 1471
1459 if ((rc = get_UCSname(&key, dentry))) 1472 if ((rc = get_UCSname(&key, dentry)))
1460 return ERR_PTR(rc); 1473 return ERR_PTR(rc);
1461 rc = dtSearch(dip, &key, &inum, &btst 1474 rc = dtSearch(dip, &key, &inum, &btstack, JFS_LOOKUP);
1462 free_UCSname(&key); 1475 free_UCSname(&key);
1463 if (rc == -ENOENT) { 1476 if (rc == -ENOENT) {
1464 ip = NULL; 1477 ip = NULL;
1465 } else if (rc) { 1478 } else if (rc) {
1466 jfs_err("jfs_lookup: dtSearch 1479 jfs_err("jfs_lookup: dtSearch returned %d", rc);
1467 ip = ERR_PTR(rc); 1480 ip = ERR_PTR(rc);
1468 } else { 1481 } else {
1469 ip = jfs_iget(dip->i_sb, inum 1482 ip = jfs_iget(dip->i_sb, inum);
1470 if (IS_ERR(ip)) 1483 if (IS_ERR(ip))
1471 jfs_err("jfs_lookup: 1484 jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum);
1472 } 1485 }
1473 1486
1474 return d_splice_alias(ip, dentry); 1487 return d_splice_alias(ip, dentry);
1475 } 1488 }
1476 1489
1477 static struct inode *jfs_nfs_get_inode(struct 1490 static struct inode *jfs_nfs_get_inode(struct super_block *sb,
1478 u64 ino, u32 generation) 1491 u64 ino, u32 generation)
1479 { 1492 {
1480 struct inode *inode; 1493 struct inode *inode;
1481 1494
1482 if (ino == 0) 1495 if (ino == 0)
1483 return ERR_PTR(-ESTALE); 1496 return ERR_PTR(-ESTALE);
1484 inode = jfs_iget(sb, ino); 1497 inode = jfs_iget(sb, ino);
1485 if (IS_ERR(inode)) 1498 if (IS_ERR(inode))
1486 return ERR_CAST(inode); 1499 return ERR_CAST(inode);
1487 1500
1488 if (generation && inode->i_generation 1501 if (generation && inode->i_generation != generation) {
1489 iput(inode); 1502 iput(inode);
1490 return ERR_PTR(-ESTALE); 1503 return ERR_PTR(-ESTALE);
1491 } 1504 }
1492 1505
1493 return inode; 1506 return inode;
1494 } 1507 }
1495 1508
1496 struct dentry *jfs_fh_to_dentry(struct super_ 1509 struct dentry *jfs_fh_to_dentry(struct super_block *sb, struct fid *fid,
1497 int fh_len, int fh_type) 1510 int fh_len, int fh_type)
1498 { 1511 {
1499 return generic_fh_to_dentry(sb, fid, 1512 return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
1500 jfs_nfs_g 1513 jfs_nfs_get_inode);
1501 } 1514 }
1502 1515
1503 struct dentry *jfs_fh_to_parent(struct super_ 1516 struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
1504 int fh_len, int fh_type) 1517 int fh_len, int fh_type)
1505 { 1518 {
1506 return generic_fh_to_parent(sb, fid, 1519 return generic_fh_to_parent(sb, fid, fh_len, fh_type,
1507 jfs_nfs_g 1520 jfs_nfs_get_inode);
1508 } 1521 }
1509 1522
1510 struct dentry *jfs_get_parent(struct dentry * 1523 struct dentry *jfs_get_parent(struct dentry *dentry)
1511 { 1524 {
1512 unsigned long parent_ino; 1525 unsigned long parent_ino;
1513 1526
1514 parent_ino = 1527 parent_ino =
1515 le32_to_cpu(JFS_IP(d_inode(de 1528 le32_to_cpu(JFS_IP(d_inode(dentry))->i_dtroot.header.idotdot);
1516 1529
1517 return d_obtain_alias(jfs_iget(dentry 1530 return d_obtain_alias(jfs_iget(dentry->d_sb, parent_ino));
1518 } 1531 }
1519 1532
1520 const struct inode_operations jfs_dir_inode_o 1533 const struct inode_operations jfs_dir_inode_operations = {
1521 .create = jfs_create, 1534 .create = jfs_create,
1522 .lookup = jfs_lookup, 1535 .lookup = jfs_lookup,
1523 .link = jfs_link, 1536 .link = jfs_link,
1524 .unlink = jfs_unlink, 1537 .unlink = jfs_unlink,
1525 .symlink = jfs_symlink, 1538 .symlink = jfs_symlink,
1526 .mkdir = jfs_mkdir, 1539 .mkdir = jfs_mkdir,
1527 .rmdir = jfs_rmdir, 1540 .rmdir = jfs_rmdir,
1528 .mknod = jfs_mknod, 1541 .mknod = jfs_mknod,
1529 .rename = jfs_rename, 1542 .rename = jfs_rename,
1530 .listxattr = jfs_listxattr, 1543 .listxattr = jfs_listxattr,
1531 .setattr = jfs_setattr, 1544 .setattr = jfs_setattr,
1532 .fileattr_get = jfs_fileattr_get, <<
1533 .fileattr_set = jfs_fileattr_set, <<
1534 #ifdef CONFIG_JFS_POSIX_ACL 1545 #ifdef CONFIG_JFS_POSIX_ACL
1535 .get_inode_acl = jfs_get_acl, !! 1546 .get_acl = jfs_get_acl,
1536 .set_acl = jfs_set_acl, 1547 .set_acl = jfs_set_acl,
1537 #endif 1548 #endif
1538 }; 1549 };
1539 1550
1540 WRAP_DIR_ITER(jfs_readdir) // FIXME! <<
1541 const struct file_operations jfs_dir_operatio 1551 const struct file_operations jfs_dir_operations = {
1542 .read = generic_read_dir, 1552 .read = generic_read_dir,
1543 .iterate_shared = shared_jfs_readdir, !! 1553 .iterate = jfs_readdir,
1544 .fsync = jfs_fsync, 1554 .fsync = jfs_fsync,
1545 .unlocked_ioctl = jfs_ioctl, 1555 .unlocked_ioctl = jfs_ioctl,
1546 .compat_ioctl = compat_ptr_ioctl, !! 1556 #ifdef CONFIG_COMPAT
>> 1557 .compat_ioctl = jfs_compat_ioctl,
>> 1558 #endif
1547 .llseek = generic_file_llseek 1559 .llseek = generic_file_llseek,
1548 }; 1560 };
1549 1561
1550 static int jfs_ci_hash(const struct dentry *d 1562 static int jfs_ci_hash(const struct dentry *dir, struct qstr *this)
1551 { 1563 {
1552 unsigned long hash; 1564 unsigned long hash;
1553 int i; 1565 int i;
1554 1566
1555 hash = init_name_hash(dir); 1567 hash = init_name_hash(dir);
1556 for (i=0; i < this->len; i++) 1568 for (i=0; i < this->len; i++)
1557 hash = partial_name_hash(tolo 1569 hash = partial_name_hash(tolower(this->name[i]), hash);
1558 this->hash = end_name_hash(hash); 1570 this->hash = end_name_hash(hash);
1559 1571
1560 return 0; 1572 return 0;
1561 } 1573 }
1562 1574
1563 static int jfs_ci_compare(const struct dentry 1575 static int jfs_ci_compare(const struct dentry *dentry,
1564 unsigned int len, const char 1576 unsigned int len, const char *str, const struct qstr *name)
1565 { 1577 {
1566 int i, result = 1; 1578 int i, result = 1;
1567 1579
1568 if (len != name->len) 1580 if (len != name->len)
1569 goto out; 1581 goto out;
1570 for (i=0; i < len; i++) { 1582 for (i=0; i < len; i++) {
1571 if (tolower(str[i]) != tolowe 1583 if (tolower(str[i]) != tolower(name->name[i]))
1572 goto out; 1584 goto out;
1573 } 1585 }
1574 result = 0; 1586 result = 0;
1575 out: 1587 out:
1576 return result; 1588 return result;
1577 } 1589 }
1578 1590
1579 static int jfs_ci_revalidate(struct dentry *d 1591 static int jfs_ci_revalidate(struct dentry *dentry, unsigned int flags)
1580 { 1592 {
1581 /* 1593 /*
1582 * This is not negative dentry. Alway 1594 * This is not negative dentry. Always valid.
1583 * 1595 *
1584 * Note, rename() to existing directo 1596 * Note, rename() to existing directory entry will have ->d_inode,
1585 * and will use existing name which i 1597 * and will use existing name which isn't specified name by user.
1586 * 1598 *
1587 * We may be able to drop this positi 1599 * We may be able to drop this positive dentry here. But dropping
1588 * positive dentry isn't good idea. S 1600 * positive dentry isn't good idea. So it's unsupported like
1589 * rename("filename", "FILENAME") for 1601 * rename("filename", "FILENAME") for now.
1590 */ 1602 */
1591 if (d_really_is_positive(dentry)) 1603 if (d_really_is_positive(dentry))
1592 return 1; 1604 return 1;
1593 1605
1594 /* 1606 /*
1595 * This may be nfsd (or something), a 1607 * This may be nfsd (or something), anyway, we can't see the
1596 * intent of this. So, since this can 1608 * intent of this. So, since this can be for creation, drop it.
1597 */ 1609 */
1598 if (!flags) 1610 if (!flags)
1599 return 0; 1611 return 0;
1600 1612
1601 /* 1613 /*
1602 * Drop the negative dentry, in order 1614 * Drop the negative dentry, in order to make sure to use the
1603 * case sensitive name which is speci 1615 * case sensitive name which is specified by user if this is
1604 * for creation. 1616 * for creation.
1605 */ 1617 */
1606 if (flags & (LOOKUP_CREATE | LOOKUP_R 1618 if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET))
1607 return 0; 1619 return 0;
1608 return 1; 1620 return 1;
1609 } 1621 }
1610 1622
1611 const struct dentry_operations jfs_ci_dentry_ 1623 const struct dentry_operations jfs_ci_dentry_operations =
1612 { 1624 {
1613 .d_hash = jfs_ci_hash, 1625 .d_hash = jfs_ci_hash,
1614 .d_compare = jfs_ci_compare, 1626 .d_compare = jfs_ci_compare,
1615 .d_revalidate = jfs_ci_revalidate, 1627 .d_revalidate = jfs_ci_revalidate,
1616 }; 1628 };
1617 1629
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.