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