diff options
author | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 11:18:54 +0100 |
---|---|---|
committer | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 11:18:54 +0100 |
commit | 7971db5a4b4176ad5df590fce07a962c643a2740 (patch) | |
tree | 6ad8e09c5376c4e4c532c3411b0171ba1011acd9 /fs/exportfs/expfs.c | |
parent | d403700bf8fc903584e830967f5d64075770848c (diff) | |
parent | c4edfced662fa64deeed89c7d8c9f96d86130c19 (diff) |
Merge branch 'for-rmk-misc' into for-rmk
Diffstat (limited to 'fs/exportfs/expfs.c')
-rw-r--r-- | fs/exportfs/expfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index 80246bad1b7..890e0182881 100644 --- a/fs/exportfs/expfs.c +++ b/fs/exportfs/expfs.c @@ -367,6 +367,8 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid, * Try to get any dentry for the given file handle from the filesystem. */ result = nop->fh_to_dentry(mnt->mnt_sb, fid, fh_len, fileid_type); + if (!result) + result = ERR_PTR(-ESTALE); if (IS_ERR(result)) return result; @@ -420,6 +422,8 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid, target_dir = nop->fh_to_parent(mnt->mnt_sb, fid, fh_len, fileid_type); + if (!target_dir) + goto err_result; err = PTR_ERR(target_dir); if (IS_ERR(target_dir)) goto err_result; |