---

yaml --- r: 119737 b: refs/heads/master c: a4f4d6d h: refs/heads/master i: 119735: 720bcfe v: v3
git-mirror · Dec 9, 2008 · 1aca86e · 1aca86e
1 parent 6200483
commit 1aca86e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 218d11a8b071b23b76c484fd5f72a4fe3306801e
+refs/heads/master: a4f4d6df537368297a84e6b9444f403f99bf59f6
diff --git a/trunk/fs/exportfs/expfs.c b/trunk/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;