Skip to contentSkip to conversation

replace hack with dget/mntget usage in fs/dcookies.c

PATCH In review Kirill Korotaev 2 participants 2 messages Sep 1, 2005 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 replace hack with dget/mntget usage in fs/dcookies.c

This patch replaces manual incrementing of refcounters on dentry/mnt in fs/dcookie.c with calls to dget()/mntget(). Noticed this when tried to change logic in dget() and it began to oops.

Kirill

fs/dcookies.c renamed from fs/dcookies.c.dget +2 -4
@@ -93,12 +93,10 @@ static struct dcookie_struct * alloc_dco
 	if (!dcs)
 		return NULL;
 
-	atomic_inc(&dentry->d_count);
-	atomic_inc(&vfsmnt->mnt_count);
 	dentry->d_cookie = dcs;
 
-	dcs->dentry = dentry;
-	dcs->vfsmnt = vfsmnt;
+	dcs->dentry = dget(dentry);
+	dcs->vfsmnt = mntget(vfsmnt);
 	hash_dcookie(dcs);
 
 	return dcs;
#1 lore raw
Quoted 8 lines · Kirill Korotaev

This patch replaces manual incrementing of refcounters on dentry/mnt in
fs/dcookie.c with calls to dget()/mntget().

...

--- linux-2.6.8.1-t032/fs/dcookies.c.dget 2004-08-14 14:54:46.000000000 +0400
+++ linux-2.6.8.1-t032/fs/dcookies.c 2005-08-23 14:09:00.000000000 +0400

Whoa. Medieval kernel.

Quoted 8 lines

@@ -93,12 +93,10 @@ static struct dcookie_struct * alloc_dco
if (!dcs)
return NULL;

- atomic_inc(&dentry->d_count);
- atomic_inc(&vfsmnt->mnt_count);
dentry->d_cookie = dcs;

Quoted 7 lines

- dcs->dentry = dentry;
- dcs->vfsmnt = vfsmnt;
+ dcs->dentry = dget(dentry);
+ dcs->vfsmnt = mntget(vfsmnt);
hash_dcookie(dcs);

return dcs;

That's already there.