diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 09:03:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 09:03:15 -0700 |
| commit | d36c30181c4cf6ead34ae30fa2c777b871225c87 (patch) | |
| tree | 8a2476c0eb6bb83ed5a8b493d79458d0e114a146 /fs/exofs/super.c | |
| parent | a406721dff91a9a5297d140dbb90327966cf9bc0 (diff) | |
| parent | 0916a5e45fbd2604a303c8cc18e6b2b7c815e4c9 (diff) | |
| download | linux-d36c30181c4cf6ead34ae30fa2c777b871225c87.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
hppfs_lookup(): don't open-code lookup_one_len()
hppfs: fix dentry leak
cramfs: get_cramfs_inode() returns ERR_PTR() on failure
ufs should use d_splice_alias()
fix exofs ->get_parent()
ceph analog of cifs build_path_from_dentry() race fix
cifs: build_path_from_dentry() race fix
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)); } |