diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2014-09-10 20:09:20 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2014-09-11 11:54:43 +0200 |
| commit | 7b7a91152d3c2ddca95172cac1675625cc8dffaf (patch) | |
| tree | 5ae5d3c55024e073754699d2936f4f4402a1eef6 /fs/gfs2 | |
| parent | GFS2: Request demote when a "try" flock fails (diff) | |
| download | linux-7b7a91152d3c2ddca95172cac1675625cc8dffaf.tar.xz linux-7b7a91152d3c2ddca95172cac1675625cc8dffaf.zip | |
GFS2: Hash the negative dentry during inode lookup
Fix a regression introduced by:
6d4ade986f9c8df31e68 GFS2: Add atomic_open support
where an early return misses d_splice_alias() which had been
adding the negative dentry.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index e62e59477884..9317ddc1b3c3 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -840,8 +840,10 @@ static struct dentry *__gfs2_lookup(struct inode *dir, struct dentry *dentry, int error; inode = gfs2_lookupi(dir, &dentry->d_name, 0); - if (!inode) + if (inode == NULL) { + d_add(dentry, NULL); return NULL; + } if (IS_ERR(inode)) return ERR_CAST(inode); |