1 // SPDX-License-Identifier: GPL-2.0-or-later 1 // SPDX-License-Identifier: GPL-2.0-or-later
2 /* 2 /*
3 * dcache.c 3 * dcache.c
4 * 4 *
5 * dentry cache handling code 5 * dentry cache handling code
6 * 6 *
7 * Copyright (C) 2002, 2004 Oracle. All right 7 * Copyright (C) 2002, 2004 Oracle. All rights reserved.
8 */ 8 */
9 9
10 #include <linux/fs.h> 10 #include <linux/fs.h>
11 #include <linux/types.h> 11 #include <linux/types.h>
12 #include <linux/slab.h> 12 #include <linux/slab.h>
13 #include <linux/namei.h> 13 #include <linux/namei.h>
14 14
15 #include <cluster/masklog.h> 15 #include <cluster/masklog.h>
16 16
17 #include "ocfs2.h" 17 #include "ocfs2.h"
18 18
19 #include "alloc.h" 19 #include "alloc.h"
20 #include "dcache.h" 20 #include "dcache.h"
21 #include "dlmglue.h" 21 #include "dlmglue.h"
22 #include "file.h" 22 #include "file.h"
23 #include "inode.h" 23 #include "inode.h"
24 #include "ocfs2_trace.h" 24 #include "ocfs2_trace.h"
25 25
26 void ocfs2_dentry_attach_gen(struct dentry *de 26 void ocfs2_dentry_attach_gen(struct dentry *dentry)
27 { 27 {
28 unsigned long gen = 28 unsigned long gen =
29 OCFS2_I(d_inode(dentry->d_pare 29 OCFS2_I(d_inode(dentry->d_parent))->ip_dir_lock_gen;
30 BUG_ON(d_inode(dentry)); 30 BUG_ON(d_inode(dentry));
31 dentry->d_fsdata = (void *)gen; 31 dentry->d_fsdata = (void *)gen;
32 } 32 }
33 33
34 34
35 static int ocfs2_dentry_revalidate(struct dent 35 static int ocfs2_dentry_revalidate(struct dentry *dentry, unsigned int flags)
36 { 36 {
37 struct inode *inode; 37 struct inode *inode;
38 int ret = 0; /* if all else fails, 38 int ret = 0; /* if all else fails, just return false */
39 struct ocfs2_super *osb; 39 struct ocfs2_super *osb;
40 40
41 if (flags & LOOKUP_RCU) 41 if (flags & LOOKUP_RCU)
42 return -ECHILD; 42 return -ECHILD;
43 43
44 inode = d_inode(dentry); 44 inode = d_inode(dentry);
45 osb = OCFS2_SB(dentry->d_sb); 45 osb = OCFS2_SB(dentry->d_sb);
46 46
47 trace_ocfs2_dentry_revalidate(dentry, 47 trace_ocfs2_dentry_revalidate(dentry, dentry->d_name.len,
48 dentry-> 48 dentry->d_name.name);
49 49
50 /* For a negative dentry - 50 /* For a negative dentry -
51 * check the generation number of the 51 * check the generation number of the parent and compare with the
52 * one stored in the inode. 52 * one stored in the inode.
53 */ 53 */
54 if (inode == NULL) { 54 if (inode == NULL) {
55 unsigned long gen = (unsigned 55 unsigned long gen = (unsigned long) dentry->d_fsdata;
56 unsigned long pgen; 56 unsigned long pgen;
57 spin_lock(&dentry->d_lock); 57 spin_lock(&dentry->d_lock);
58 pgen = OCFS2_I(d_inode(dentry- 58 pgen = OCFS2_I(d_inode(dentry->d_parent))->ip_dir_lock_gen;
59 spin_unlock(&dentry->d_lock); 59 spin_unlock(&dentry->d_lock);
60 trace_ocfs2_dentry_revalidate_ 60 trace_ocfs2_dentry_revalidate_negative(dentry->d_name.len,
61 61 dentry->d_name.name,
62 62 pgen, gen);
63 if (gen != pgen) 63 if (gen != pgen)
64 goto bail; 64 goto bail;
65 goto valid; 65 goto valid;
66 } 66 }
67 67
68 BUG_ON(!osb); 68 BUG_ON(!osb);
69 69
70 if (inode == osb->root_inode || is_bad 70 if (inode == osb->root_inode || is_bad_inode(inode))
71 goto bail; 71 goto bail;
72 72
73 spin_lock(&OCFS2_I(inode)->ip_lock); 73 spin_lock(&OCFS2_I(inode)->ip_lock);
74 /* did we or someone else delete this 74 /* did we or someone else delete this inode? */
75 if (OCFS2_I(inode)->ip_flags & OCFS2_I 75 if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_DELETED) {
76 spin_unlock(&OCFS2_I(inode)->i 76 spin_unlock(&OCFS2_I(inode)->ip_lock);
77 trace_ocfs2_dentry_revalidate_ 77 trace_ocfs2_dentry_revalidate_delete(
78 (unsigned long 78 (unsigned long long)OCFS2_I(inode)->ip_blkno);
79 goto bail; 79 goto bail;
80 } 80 }
81 spin_unlock(&OCFS2_I(inode)->ip_lock); 81 spin_unlock(&OCFS2_I(inode)->ip_lock);
82 82
83 /* 83 /*
84 * We don't need a cluster lock to tes 84 * We don't need a cluster lock to test this because once an
85 * inode nlink hits zero, it never goe 85 * inode nlink hits zero, it never goes back.
86 */ 86 */
87 if (inode->i_nlink == 0) { 87 if (inode->i_nlink == 0) {
88 trace_ocfs2_dentry_revalidate_ 88 trace_ocfs2_dentry_revalidate_orphaned(
89 (unsigned long long)OC 89 (unsigned long long)OCFS2_I(inode)->ip_blkno,
90 S_ISDIR(inode->i_mode) 90 S_ISDIR(inode->i_mode));
91 goto bail; 91 goto bail;
92 } 92 }
93 93
94 /* 94 /*
95 * If the last lookup failed to create 95 * If the last lookup failed to create dentry lock, let us
96 * redo it. 96 * redo it.
97 */ 97 */
98 if (!dentry->d_fsdata) { 98 if (!dentry->d_fsdata) {
99 trace_ocfs2_dentry_revalidate_ 99 trace_ocfs2_dentry_revalidate_nofsdata(
100 (unsigned long 100 (unsigned long long)OCFS2_I(inode)->ip_blkno);
101 goto bail; 101 goto bail;
102 } 102 }
103 103
104 valid: 104 valid:
105 ret = 1; 105 ret = 1;
106 106
107 bail: 107 bail:
108 trace_ocfs2_dentry_revalidate_ret(ret) 108 trace_ocfs2_dentry_revalidate_ret(ret);
109 return ret; 109 return ret;
110 } 110 }
111 111
112 static int ocfs2_match_dentry(struct dentry *d 112 static int ocfs2_match_dentry(struct dentry *dentry,
113 u64 parent_blkno 113 u64 parent_blkno,
114 int skip_unhashe 114 int skip_unhashed)
115 { 115 {
116 struct inode *parent; 116 struct inode *parent;
117 117
118 /* 118 /*
119 * ocfs2_lookup() does a d_splice_alia 119 * ocfs2_lookup() does a d_splice_alias() _before_ attaching
120 * to the lock data, so we skip those 120 * to the lock data, so we skip those here, otherwise
121 * ocfs2_dentry_attach_lock() will get 121 * ocfs2_dentry_attach_lock() will get its original dentry
122 * back. 122 * back.
123 */ 123 */
124 if (!dentry->d_fsdata) 124 if (!dentry->d_fsdata)
125 return 0; 125 return 0;
126 126
>> 127 if (!dentry->d_parent)
>> 128 return 0;
>> 129
127 if (skip_unhashed && d_unhashed(dentry 130 if (skip_unhashed && d_unhashed(dentry))
128 return 0; 131 return 0;
129 132
130 parent = d_inode(dentry->d_parent); 133 parent = d_inode(dentry->d_parent);
>> 134 /* Negative parent dentry? */
>> 135 if (!parent)
>> 136 return 0;
>> 137
131 /* Name is in a different directory. * 138 /* Name is in a different directory. */
132 if (OCFS2_I(parent)->ip_blkno != paren 139 if (OCFS2_I(parent)->ip_blkno != parent_blkno)
133 return 0; 140 return 0;
134 141
135 return 1; 142 return 1;
136 } 143 }
137 144
138 /* 145 /*
139 * Walk the inode alias list, and find a dentr 146 * Walk the inode alias list, and find a dentry which has a given
140 * parent. ocfs2_dentry_attach_lock() wants to 147 * parent. ocfs2_dentry_attach_lock() wants to find _any_ alias as it
141 * is looking for a dentry_lock reference. The 148 * is looking for a dentry_lock reference. The downconvert thread is
142 * looking to unhash aliases, so we allow it t 149 * looking to unhash aliases, so we allow it to skip any that already
143 * have that property. 150 * have that property.
144 */ 151 */
145 struct dentry *ocfs2_find_local_alias(struct i 152 struct dentry *ocfs2_find_local_alias(struct inode *inode,
146 u64 pare 153 u64 parent_blkno,
147 int skip 154 int skip_unhashed)
148 { 155 {
149 struct dentry *dentry; 156 struct dentry *dentry;
150 157
151 spin_lock(&inode->i_lock); 158 spin_lock(&inode->i_lock);
152 hlist_for_each_entry(dentry, &inode->i 159 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
153 spin_lock(&dentry->d_lock); 160 spin_lock(&dentry->d_lock);
154 if (ocfs2_match_dentry(dentry, 161 if (ocfs2_match_dentry(dentry, parent_blkno, skip_unhashed)) {
155 trace_ocfs2_find_local 162 trace_ocfs2_find_local_alias(dentry->d_name.len,
156 163 dentry->d_name.name);
157 164
158 dget_dlock(dentry); 165 dget_dlock(dentry);
159 spin_unlock(&dentry->d 166 spin_unlock(&dentry->d_lock);
160 spin_unlock(&inode->i_ 167 spin_unlock(&inode->i_lock);
161 return dentry; 168 return dentry;
162 } 169 }
163 spin_unlock(&dentry->d_lock); 170 spin_unlock(&dentry->d_lock);
164 } 171 }
165 spin_unlock(&inode->i_lock); 172 spin_unlock(&inode->i_lock);
166 return NULL; 173 return NULL;
167 } 174 }
168 175
169 DEFINE_SPINLOCK(dentry_attach_lock); 176 DEFINE_SPINLOCK(dentry_attach_lock);
170 177
171 /* 178 /*
172 * Attach this dentry to a cluster lock. 179 * Attach this dentry to a cluster lock.
173 * 180 *
174 * Dentry locks cover all links in a given dir 181 * Dentry locks cover all links in a given directory to a particular
175 * inode. We do this so that ocfs2 can build a 182 * inode. We do this so that ocfs2 can build a lock name which all
176 * nodes in the cluster can agree on at all ti 183 * nodes in the cluster can agree on at all times. Shoving full names
177 * in the cluster lock won't work due to size 184 * in the cluster lock won't work due to size restrictions. Covering
178 * links inside of a directory is a good compr 185 * links inside of a directory is a good compromise because it still
179 * allows us to use the parent directory lock 186 * allows us to use the parent directory lock to synchronize
180 * operations. 187 * operations.
181 * 188 *
182 * Call this function with the parent dir sema 189 * Call this function with the parent dir semaphore and the parent dir
183 * cluster lock held. 190 * cluster lock held.
184 * 191 *
185 * The dir semaphore will protect us from havi 192 * The dir semaphore will protect us from having to worry about
186 * concurrent processes on our node trying to 193 * concurrent processes on our node trying to attach a lock at the
187 * same time. 194 * same time.
188 * 195 *
189 * The dir cluster lock (held at either PR or 196 * The dir cluster lock (held at either PR or EX mode) protects us
190 * from unlink and rename on other nodes. 197 * from unlink and rename on other nodes.
191 * 198 *
192 * A dput() can happen asynchronously due to p 199 * A dput() can happen asynchronously due to pruning, so we cover
193 * attaching and detaching the dentry lock wit 200 * attaching and detaching the dentry lock with a
194 * dentry_attach_lock. 201 * dentry_attach_lock.
195 * 202 *
196 * A node which has done lookup on a name reta 203 * A node which has done lookup on a name retains a protected read
197 * lock until final dput. If the user requests 204 * lock until final dput. If the user requests and unlink or rename,
198 * the protected read is upgraded to an exclus 205 * the protected read is upgraded to an exclusive lock. Other nodes
199 * who have seen the dentry will then be infor 206 * who have seen the dentry will then be informed that they need to
200 * downgrade their lock, which will involve d_ 207 * downgrade their lock, which will involve d_delete on the
201 * dentry. This happens in ocfs2_dentry_conver 208 * dentry. This happens in ocfs2_dentry_convert_worker().
202 */ 209 */
203 int ocfs2_dentry_attach_lock(struct dentry *de 210 int ocfs2_dentry_attach_lock(struct dentry *dentry,
204 struct inode *ino 211 struct inode *inode,
205 u64 parent_blkno) 212 u64 parent_blkno)
206 { 213 {
207 int ret; 214 int ret;
208 struct dentry *alias; 215 struct dentry *alias;
209 struct ocfs2_dentry_lock *dl = dentry- 216 struct ocfs2_dentry_lock *dl = dentry->d_fsdata;
210 217
211 trace_ocfs2_dentry_attach_lock(dentry- 218 trace_ocfs2_dentry_attach_lock(dentry->d_name.len, dentry->d_name.name,
212 (unsign 219 (unsigned long long)parent_blkno, dl);
213 220
214 /* 221 /*
215 * Negative dentry. We ignore these fo 222 * Negative dentry. We ignore these for now.
216 * 223 *
217 * XXX: Could we can improve ocfs2_den 224 * XXX: Could we can improve ocfs2_dentry_revalidate() by
218 * tracking these? 225 * tracking these?
219 */ 226 */
220 if (!inode) 227 if (!inode)
221 return 0; 228 return 0;
222 229
223 if (d_really_is_negative(dentry) && de 230 if (d_really_is_negative(dentry) && dentry->d_fsdata) {
224 /* Converting a negative dentr 231 /* Converting a negative dentry to positive
225 Clear dentry->d_fsdata */ 232 Clear dentry->d_fsdata */
226 dentry->d_fsdata = dl = NULL; 233 dentry->d_fsdata = dl = NULL;
227 } 234 }
228 235
229 if (dl) { 236 if (dl) {
230 mlog_bug_on_msg(dl->dl_parent_ 237 mlog_bug_on_msg(dl->dl_parent_blkno != parent_blkno,
231 " \"%pd\": old 238 " \"%pd\": old parent: %llu, new: %llu\n",
232 dentry, 239 dentry,
233 (unsigned long 240 (unsigned long long)parent_blkno,
234 (unsigned long 241 (unsigned long long)dl->dl_parent_blkno);
235 return 0; 242 return 0;
236 } 243 }
237 244
238 alias = ocfs2_find_local_alias(inode, 245 alias = ocfs2_find_local_alias(inode, parent_blkno, 0);
239 if (alias) { 246 if (alias) {
240 /* 247 /*
241 * Great, an alias exists, whi 248 * Great, an alias exists, which means we must have a
242 * dentry lock already. We can 249 * dentry lock already. We can just grab the lock off
243 * the alias and add it to the 250 * the alias and add it to the list.
244 * 251 *
245 * We're depending here on the 252 * We're depending here on the fact that this dentry
246 * was found and exists in the 253 * was found and exists in the dcache and so must have
247 * a reference to the dentry_l 254 * a reference to the dentry_lock because we can't
248 * race creates. Final dput() 255 * race creates. Final dput() cannot happen on it
249 * since we have it pinned, so 256 * since we have it pinned, so our reference is safe.
250 */ 257 */
251 dl = alias->d_fsdata; 258 dl = alias->d_fsdata;
252 mlog_bug_on_msg(!dl, "parent % 259 mlog_bug_on_msg(!dl, "parent %llu, ino %llu\n",
253 (unsigned long 260 (unsigned long long)parent_blkno,
254 (unsigned long 261 (unsigned long long)OCFS2_I(inode)->ip_blkno);
255 262
256 mlog_bug_on_msg(dl->dl_parent_ 263 mlog_bug_on_msg(dl->dl_parent_blkno != parent_blkno,
257 " \"%pd\": old 264 " \"%pd\": old parent: %llu, new: %llu\n",
258 dentry, 265 dentry,
259 (unsigned long 266 (unsigned long long)parent_blkno,
260 (unsigned long 267 (unsigned long long)dl->dl_parent_blkno);
261 268
262 trace_ocfs2_dentry_attach_lock 269 trace_ocfs2_dentry_attach_lock_found(dl->dl_lockres.l_name,
263 (unsigned long 270 (unsigned long long)parent_blkno,
264 (unsigned long 271 (unsigned long long)OCFS2_I(inode)->ip_blkno);
265 272
266 goto out_attach; 273 goto out_attach;
267 } 274 }
268 275
269 /* 276 /*
270 * There are no other aliases 277 * There are no other aliases
271 */ 278 */
272 dl = kmalloc(sizeof(*dl), GFP_NOFS); 279 dl = kmalloc(sizeof(*dl), GFP_NOFS);
273 if (!dl) { 280 if (!dl) {
274 ret = -ENOMEM; 281 ret = -ENOMEM;
275 mlog_errno(ret); 282 mlog_errno(ret);
276 return ret; 283 return ret;
277 } 284 }
278 285
279 dl->dl_count = 0; 286 dl->dl_count = 0;
280 /* 287 /*
281 * Does this have to happen below, for 288 * Does this have to happen below, for all attaches, in case
282 * the struct inode gets blown away by 289 * the struct inode gets blown away by the downconvert thread?
283 */ 290 */
284 dl->dl_inode = igrab(inode); 291 dl->dl_inode = igrab(inode);
285 dl->dl_parent_blkno = parent_blkno; 292 dl->dl_parent_blkno = parent_blkno;
286 ocfs2_dentry_lock_res_init(dl, parent_ 293 ocfs2_dentry_lock_res_init(dl, parent_blkno, inode);
287 294
288 out_attach: 295 out_attach:
289 spin_lock(&dentry_attach_lock); 296 spin_lock(&dentry_attach_lock);
290 if (unlikely(dentry->d_fsdata && !alia 297 if (unlikely(dentry->d_fsdata && !alias)) {
291 /* d_fsdata is set by a racing 298 /* d_fsdata is set by a racing thread which is doing
292 * the same thing as this thre 299 * the same thing as this thread is doing. Leave the racing
293 * thread going ahead and we r 300 * thread going ahead and we return here.
294 */ 301 */
295 spin_unlock(&dentry_attach_loc 302 spin_unlock(&dentry_attach_lock);
296 iput(dl->dl_inode); 303 iput(dl->dl_inode);
297 ocfs2_lock_res_free(&dl->dl_lo 304 ocfs2_lock_res_free(&dl->dl_lockres);
298 kfree(dl); 305 kfree(dl);
299 return 0; 306 return 0;
300 } 307 }
301 308
302 dentry->d_fsdata = dl; 309 dentry->d_fsdata = dl;
303 dl->dl_count++; 310 dl->dl_count++;
304 spin_unlock(&dentry_attach_lock); 311 spin_unlock(&dentry_attach_lock);
305 312
306 /* 313 /*
307 * This actually gets us our PRMODE le 314 * This actually gets us our PRMODE level lock. From now on,
308 * we'll have a notification if one of 315 * we'll have a notification if one of these names is
309 * destroyed on another node. 316 * destroyed on another node.
310 */ 317 */
311 ret = ocfs2_dentry_lock(dentry, 0); 318 ret = ocfs2_dentry_lock(dentry, 0);
312 if (!ret) 319 if (!ret)
313 ocfs2_dentry_unlock(dentry, 0) 320 ocfs2_dentry_unlock(dentry, 0);
314 else 321 else
315 mlog_errno(ret); 322 mlog_errno(ret);
316 323
317 /* 324 /*
318 * In case of error, manually free the 325 * In case of error, manually free the allocation and do the iput().
319 * We need to do this because error he 326 * We need to do this because error here means no d_instantiate(),
320 * which means iput() will not be call 327 * which means iput() will not be called during dput(dentry).
321 */ 328 */
322 if (ret < 0 && !alias) { 329 if (ret < 0 && !alias) {
323 ocfs2_lock_res_free(&dl->dl_lo 330 ocfs2_lock_res_free(&dl->dl_lockres);
324 BUG_ON(dl->dl_count != 1); 331 BUG_ON(dl->dl_count != 1);
325 spin_lock(&dentry_attach_lock) 332 spin_lock(&dentry_attach_lock);
326 dentry->d_fsdata = NULL; 333 dentry->d_fsdata = NULL;
327 spin_unlock(&dentry_attach_loc 334 spin_unlock(&dentry_attach_lock);
328 kfree(dl); 335 kfree(dl);
329 iput(inode); 336 iput(inode);
330 } 337 }
331 338
332 dput(alias); 339 dput(alias);
333 340
334 return ret; 341 return ret;
335 } 342 }
336 343
337 /* 344 /*
338 * ocfs2_dentry_iput() and friends. 345 * ocfs2_dentry_iput() and friends.
339 * 346 *
340 * At this point, our particular dentry is det 347 * At this point, our particular dentry is detached from the inodes
341 * alias list, so there's no way that the lock 348 * alias list, so there's no way that the locking code can find it.
342 * 349 *
343 * The interesting stuff happens when we deter 350 * The interesting stuff happens when we determine that our lock needs
344 * to go away because this is the last subdir 351 * to go away because this is the last subdir alias in the
345 * system. This function needs to handle a cou 352 * system. This function needs to handle a couple things:
346 * 353 *
347 * 1) Synchronizing lock shutdown with the dow 354 * 1) Synchronizing lock shutdown with the downconvert threads. This
348 * is already handled for us via the lockre 355 * is already handled for us via the lockres release drop function
349 * called in ocfs2_release_dentry_lock() 356 * called in ocfs2_release_dentry_lock()
350 * 357 *
351 * 2) A race may occur when we're doing our lo 358 * 2) A race may occur when we're doing our lock shutdown and
352 * another process wants to create a new de 359 * another process wants to create a new dentry lock. Right now we
353 * let them race, which means that for a ve 360 * let them race, which means that for a very short while, this
354 * node might have two locks on a lock reso 361 * node might have two locks on a lock resource. This should be a
355 * problem though because one of them is in 362 * problem though because one of them is in the process of being
356 * thrown out. 363 * thrown out.
357 */ 364 */
358 static void ocfs2_drop_dentry_lock(struct ocfs 365 static void ocfs2_drop_dentry_lock(struct ocfs2_super *osb,
359 struct ocfs 366 struct ocfs2_dentry_lock *dl)
360 { 367 {
361 iput(dl->dl_inode); 368 iput(dl->dl_inode);
362 ocfs2_simple_drop_lockres(osb, &dl->dl 369 ocfs2_simple_drop_lockres(osb, &dl->dl_lockres);
363 ocfs2_lock_res_free(&dl->dl_lockres); 370 ocfs2_lock_res_free(&dl->dl_lockres);
364 kfree(dl); 371 kfree(dl);
365 } 372 }
366 373
367 void ocfs2_dentry_lock_put(struct ocfs2_super 374 void ocfs2_dentry_lock_put(struct ocfs2_super *osb,
368 struct ocfs2_dentry 375 struct ocfs2_dentry_lock *dl)
369 { 376 {
370 int unlock = 0; 377 int unlock = 0;
371 378
372 BUG_ON(dl->dl_count == 0); 379 BUG_ON(dl->dl_count == 0);
373 380
374 spin_lock(&dentry_attach_lock); 381 spin_lock(&dentry_attach_lock);
375 dl->dl_count--; 382 dl->dl_count--;
376 unlock = !dl->dl_count; 383 unlock = !dl->dl_count;
377 spin_unlock(&dentry_attach_lock); 384 spin_unlock(&dentry_attach_lock);
378 385
379 if (unlock) 386 if (unlock)
380 ocfs2_drop_dentry_lock(osb, dl 387 ocfs2_drop_dentry_lock(osb, dl);
381 } 388 }
382 389
383 static void ocfs2_dentry_iput(struct dentry *d 390 static void ocfs2_dentry_iput(struct dentry *dentry, struct inode *inode)
384 { 391 {
385 struct ocfs2_dentry_lock *dl = dentry- 392 struct ocfs2_dentry_lock *dl = dentry->d_fsdata;
386 393
387 if (!dl) { 394 if (!dl) {
388 /* 395 /*
389 * No dentry lock is ok if we' 396 * No dentry lock is ok if we're disconnected or
390 * unhashed. 397 * unhashed.
391 */ 398 */
392 if (!(dentry->d_flags & DCACHE 399 if (!(dentry->d_flags & DCACHE_DISCONNECTED) &&
393 !d_unhashed(dentry)) { 400 !d_unhashed(dentry)) {
394 unsigned long long ino 401 unsigned long long ino = 0ULL;
395 if (inode) 402 if (inode)
396 ino = (unsigne 403 ino = (unsigned long long)OCFS2_I(inode)->ip_blkno;
397 mlog(ML_ERROR, "Dentry 404 mlog(ML_ERROR, "Dentry is missing cluster lock. "
398 "inode: %llu, d_f 405 "inode: %llu, d_flags: 0x%x, d_name: %pd\n",
399 ino, dentry->d_fl 406 ino, dentry->d_flags, dentry);
400 } 407 }
401 408
402 goto out; 409 goto out;
403 } 410 }
404 411
405 mlog_bug_on_msg(dl->dl_count == 0, "de 412 mlog_bug_on_msg(dl->dl_count == 0, "dentry: %pd, count: %u\n",
406 dentry, dl->dl_count); 413 dentry, dl->dl_count);
407 414
408 ocfs2_dentry_lock_put(OCFS2_SB(dentry- 415 ocfs2_dentry_lock_put(OCFS2_SB(dentry->d_sb), dl);
409 416
410 out: 417 out:
411 iput(inode); 418 iput(inode);
412 } 419 }
413 420
414 /* 421 /*
415 * d_move(), but keep the locks in sync. 422 * d_move(), but keep the locks in sync.
416 * 423 *
417 * When we are done, "dentry" will have the pa 424 * When we are done, "dentry" will have the parent dir and name of
418 * "target", which will be thrown away. 425 * "target", which will be thrown away.
419 * 426 *
420 * We manually update the lock of "dentry" if 427 * We manually update the lock of "dentry" if need be.
421 * 428 *
422 * "target" doesn't have it's dentry lock touc 429 * "target" doesn't have it's dentry lock touched - we allow the later
423 * dput() to handle this for us. 430 * dput() to handle this for us.
424 * 431 *
425 * This is called during ocfs2_rename(), while 432 * This is called during ocfs2_rename(), while holding parent
426 * directory locks. The dentries have already 433 * directory locks. The dentries have already been deleted on other
427 * nodes via ocfs2_remote_dentry_delete(). 434 * nodes via ocfs2_remote_dentry_delete().
428 * 435 *
429 * Normally, the VFS handles the d_move() for 436 * Normally, the VFS handles the d_move() for the file system, after
430 * the ->rename() callback. OCFS2 wants to han 437 * the ->rename() callback. OCFS2 wants to handle this internally, so
431 * the new lock can be created atomically with 438 * the new lock can be created atomically with respect to the cluster.
432 */ 439 */
433 void ocfs2_dentry_move(struct dentry *dentry, 440 void ocfs2_dentry_move(struct dentry *dentry, struct dentry *target,
434 struct inode *old_dir, 441 struct inode *old_dir, struct inode *new_dir)
435 { 442 {
436 int ret; 443 int ret;
437 struct ocfs2_super *osb = OCFS2_SB(old 444 struct ocfs2_super *osb = OCFS2_SB(old_dir->i_sb);
438 struct inode *inode = d_inode(dentry); 445 struct inode *inode = d_inode(dentry);
439 446
440 /* 447 /*
441 * Move within the same directory, so 448 * Move within the same directory, so the actual lock info won't
442 * change. 449 * change.
443 * 450 *
444 * XXX: Is there any advantage to drop 451 * XXX: Is there any advantage to dropping the lock here?
445 */ 452 */
446 if (old_dir == new_dir) 453 if (old_dir == new_dir)
447 goto out_move; 454 goto out_move;
448 455
449 ocfs2_dentry_lock_put(osb, dentry->d_f 456 ocfs2_dentry_lock_put(osb, dentry->d_fsdata);
450 457
451 dentry->d_fsdata = NULL; 458 dentry->d_fsdata = NULL;
452 ret = ocfs2_dentry_attach_lock(dentry, 459 ret = ocfs2_dentry_attach_lock(dentry, inode, OCFS2_I(new_dir)->ip_blkno);
453 if (ret) 460 if (ret)
454 mlog_errno(ret); 461 mlog_errno(ret);
455 462
456 out_move: 463 out_move:
457 d_move(dentry, target); 464 d_move(dentry, target);
458 } 465 }
459 466
460 const struct dentry_operations ocfs2_dentry_op 467 const struct dentry_operations ocfs2_dentry_ops = {
461 .d_revalidate = ocfs2_dentry 468 .d_revalidate = ocfs2_dentry_revalidate,
462 .d_iput = ocfs2_dentry 469 .d_iput = ocfs2_dentry_iput,
463 }; 470 };
464 471
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.