diff options
author | Keith Packard <keithp@keithp.com> | 2011-07-22 13:40:42 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-07-22 13:40:42 -0700 |
commit | df7976797fa9af161690dbf4dee81ed92cdc150f (patch) | |
tree | be6f04706d91cc80da4dbd3a5f5f2a174f1bdae3 /fs/exofs/super.c | |
parent | drm/i915: Skip GPU wait for scanout pin while wedged (diff) | |
parent | drm/i915: load the LUT before pipe enable on ILK+ (diff) | |
download | linux-dev-df7976797fa9af161690dbf4dee81ed92cdc150f.tar.xz linux-dev-df7976797fa9af161690dbf4dee81ed92cdc150f.zip |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'fs/exofs/super.c')
-rw-r--r-- | fs/exofs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/exofs/super.c b/fs/exofs/super.c index 06065bd37fc3..c57beddcc217 100644 --- a/fs/exofs/super.c +++ b/fs/exofs/super.c @@ -913,7 +913,7 @@ struct dentry *exofs_get_parent(struct dentry *child) unsigned long ino = exofs_parent_ino(child); if (!ino) - return NULL; + return ERR_PTR(-ESTALE); return d_obtain_alias(exofs_iget(child->d_inode->i_sb, ino)); } |