X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fexportfs%2Fexpfs.c;h=93e77c3d24906af5156254b29ee1cd3e39ba1ac3;hb=refs%2Fheads%2Fvserver;hp=b06b54f1bbbbda611e39252d2df5a86b6afaa3c8;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git

diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c
index b06b54f1b..93e77c3d2 100644
--- a/fs/exportfs/expfs.c
+++ b/fs/exportfs/expfs.c
@@ -102,7 +102,7 @@ find_exported_dentry(struct super_block *sb, void *obj, void *parent,
 		if (acceptable(context, result))
 			return result;
 		if (S_ISDIR(result->d_inode->i_mode)) {
-			/* there is no other dentry, so fail */
+			err = -EACCES;
 			goto err_result;
 		}
 
@@ -315,7 +315,7 @@ struct getdents_callback {
  * the name matching the specified inode number.
  */
 static int filldir_one(void * __buf, const char * name, int len,
-			loff_t pos, ino_t ino, unsigned int d_type)
+			loff_t pos, u64 ino, unsigned int d_type)
 {
 	struct getdents_callback *buf = __buf;
 	int result = 0;