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