From mboxrd@z Thu Jan 1 00:00:00 1970 From: "J. Bruce Fields" Subject: [PATCH 2/2] fs/dcache: allow __d_obtain_alias() to return unhashed dentries Date: Fri, 17 Dec 2010 13:00:23 -0500 Message-ID: <20101217180022.GB11515@fieldses.org> References: <20101112184353.GA32745@fieldses.org> <20101115174837.GB10044@fieldses.org> <20101129193248.GA9897@fieldses.org> <20101203223326.GB28763@fieldses.org> <20101213051944.GA8688@amd> <20101214220102.GM24828@fieldses.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Alexander Viro , Nick Piggin , linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Nick Piggin Return-path: Content-Disposition: inline In-Reply-To: <20101214220102.GM24828-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> Sender: linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-fsdevel.vger.kernel.org =46rom: J. Bruce Fields Without this patch =C2=A0 =C2=A0 =C2=A0 =C2=A0client$ mount -tnfs4 server:/export/ /mnt/ =C2=A0 =C2=A0 =C2=A0 =C2=A0client$ tail -f /mnt/FOO =C2=A0 =C2=A0 =C2=A0 =C2=A0... =C2=A0 =C2=A0 =C2=A0 =C2=A0server$ df -i /export =C2=A0 =C2=A0 =C2=A0 =C2=A0server$ rm /export/FOO =C2=A0 =C2=A0 =C2=A0 =C2=A0(^C the tail -f) =C2=A0 =C2=A0 =C2=A0 =C2=A0server$ df -i /export =C2=A0 =C2=A0 =C2=A0 =C2=A0server$ echo 2 >/proc/sys/vm/drop_caches =C2=A0 =C2=A0 =C2=A0 =C2=A0server$ df -i /export the df's will show that the inode is not freed on the filesystem until the last step, when it could have been freed after killing the client's tail -f. =C2=A0On-disk data won't be deallocated either, leading to pos= sible spurious ENOSPC. This occurs because when the client does the close, it arrives in a compound with a putfh and a close, processed like: =C2=A0 =C2=A0 =C2=A0 =C2=A0- putfh: look up the filehandle. =C2=A0The o= nly alias found for the =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0inode will be DCACHE_UNHASHED alias r= eferenced by the filp =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0associated with the nfsd open. =C2=A0= d_obtain_alias() doesn't like =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0this, so it creates a new DCACHE_DISC= ONECTED dentry and =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0returns that instead. Nick Piggin suggested fixing this by allowing d_obtain_alias to return the unhashed dentry that is referenced by the filp, instead of making i= t create a new dentry. Leave __d_find_alias() alone to avoid changing behavior of other callers. Also nfsd doesn't need all the checks of __d_find_alias(); any dentry, hashed or unhashed, disconnected or not, should work. Signed-off-by: J. Bruce Fields --- fs/dcache.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) On Tue, Dec 14, 2010 at 05:01:02PM -0500, J. Bruce Fields wrote: > On Mon, Dec 13, 2010 at 04:19:44PM +1100, Nick Piggin wrote: > > Not sure where Al's hiding... > >=20 > > But I would like to update the comments, and perhaps even a new > > add a new function here (or new flag to __d_find_alias). > >=20 > > AFAIKS, the callers are OK, however I suppose d_splice_alias and > > d_materialise_unique should not have unlinked inodes at this point, > > so at least a BUG_ON for them might be a good idea? >=20 > That does sound safer. I'm pretty confused by the various > __di_splice_alias callers. I'll go search through them and see if I = can > understand better.... I think a new __d_find_alias flag would just make it more confusing. And it looks like all d_obtain_alias needs is something much simpler. This works for me. --b. diff --git a/fs/dcache.c b/fs/dcache.c index 5ed93cd..d5f9da4 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1135,6 +1135,28 @@ static inline struct hlist_head *d_hash(struct d= entry *parent, return dentry_hashtable + (hash & D_HASHMASK); } =20 +static struct dentry * __d_find_any_alias(struct inode *inode) +{ + struct dentry *alias; + + if (list_empty(&inode->i_dentry)) + return NULL; + alias =3D list_first_entry(&inode->i_dentry, struct dentry, d_alias); + __dget_locked(alias); + return alias; +} + +static struct dentry * d_find_any_alias(struct inode *inode) +{ + struct dentry *de; + + spin_lock(&dcache_lock); + de =3D __d_find_alias(inode, 0); + spin_unlock(&dcache_lock); + return de; +} + + /** * d_obtain_alias - find or allocate a dentry for a given inode * @inode: inode to allocate the dentry for @@ -1164,7 +1186,7 @@ struct dentry *d_obtain_alias(struct inode *inode= ) if (IS_ERR(inode)) return ERR_CAST(inode); =20 - res =3D d_find_alias(inode); + res =3D d_find_any_alias(inode); if (res) goto out_iput; =20 @@ -1176,7 +1198,7 @@ struct dentry *d_obtain_alias(struct inode *inode= ) tmp->d_parent =3D tmp; /* make sure dput doesn't croak */ =20 spin_lock(&dcache_lock); - res =3D __d_find_alias(inode, 0); + res =3D __d_find_any_alias(inode); if (res) { spin_unlock(&dcache_lock); dput(tmp); --=20 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html