From 4a374d528abc5a9b1454b00955ca99d565a07b6f Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 29 Nov 2012 22:04:36 -0500 Subject: [PATCH] --- yaml --- r: 336174 b: refs/heads/master c: c44600c9d1de64314c2bd58103f15acb53e10073 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/dir.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 499e7fddb475..a842af46ffa9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 696199f8ccf7fc6d17ef89c296ad3b6c78c52d9c +refs/heads/master: c44600c9d1de64314c2bd58103f15acb53e10073 diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c index 99489cfca24d..b9e66b7e0c14 100644 --- a/trunk/fs/nfs/dir.c +++ b/trunk/fs/nfs/dir.c @@ -1101,6 +1101,8 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags) out_zap_parent: nfs_zap_caches(dir); out_bad: + nfs_free_fattr(fattr); + nfs_free_fhandle(fhandle); nfs_mark_for_revalidate(dir); if (inode && S_ISDIR(inode->i_mode)) { /* Purge readdir caches. */ @@ -1113,8 +1115,6 @@ static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags) shrink_dcache_parent(dentry); } d_drop(dentry); - nfs_free_fattr(fattr); - nfs_free_fhandle(fhandle); dput(parent); dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) is invalid\n", __func__, dentry->d_parent->d_name.name,