patch-2.2.7 linux/fs/umsdos/rdir.c

• Lines: 41
• Date: Fri Apr 23 21:20:38 1999
• Orig file: v2.2.6/linux/fs/umsdos/rdir.c
• Orig date: Wed Dec 16 10:32:56 1998

diff -u --recursive --new-file v2.2.6/linux/fs/umsdos/rdir.c linux/fs/umsdos/rdir.c
@@ -79,9 +79,9 @@
  * In the real root directory (c:\), the directory ..
  * is the pseudo root (c:\linux).
  */
-int umsdos_rlookup_x ( struct inode *dir, struct dentry *dentry, int nopseudo)
+struct dentry *umsdos_rlookup_x ( struct inode *dir, struct dentry *dentry, int nopseudo)
 {
-	int ret;
+	struct dentry *ret;
 
 	if (saved_root && dir == saved_root->d_inode && !nopseudo &&
 	    dentry->d_name.len == UMSDOS_PSDROOT_LEN &&
@@ -91,15 +91,16 @@
 		 * /linux won't show
 		 */
 		 
-		ret = -ENOENT;
+		ret = ERR_PTR(-ENOENT);
 		goto out;
 	}
 
 	ret = msdos_lookup (dir, dentry);
 	if (ret) {
 		printk(KERN_WARNING
-			"umsdos_rlookup_x: %s/%s failed, ret=%d\n",
-			dentry->d_parent->d_name.name, dentry->d_name.name,ret);
+			"umsdos_rlookup_x: %s/%s failed, ret=%ld\n",
+			dentry->d_parent->d_name.name, dentry->d_name.name,
+			PTR_ERR(ret));
 		goto out;
 	}
 	if (dentry->d_inode) {
@@ -119,7 +120,7 @@
 }
 
 
-int UMSDOS_rlookup ( struct inode *dir, struct dentry *dentry)
+struct dentry *UMSDOS_rlookup ( struct inode *dir, struct dentry *dentry)
 {
 	return umsdos_rlookup_x (dir, dentry, 0);
 }