PNP: add all PNP card device id's as individual aliases

[linux-2.6-omap-h63xx.git] / fs / efs / namei.c

diff --git a/fs/efs/namei.c b/fs/efs/namei.c
index 5276b19423c1abeda0ccd20cc0b0f0f99fc0d1eb..3a404e7fad5303ad03bbef6cdae5730734e983ab 100644 (file)
--- a/fs/efs/namei.c
+++ b/fs/efs/namei.c
@@ -8,8 +8,10 @@
 
 #include <linux/buffer_head.h>
 #include <linux/string.h>
-#include <linux/efs_fs.h>
 #include <linux/smp_lock.h>
+#include <linux/exportfs.h>
+#include "efs.h"
+
 
 static efs_ino_t efs_find_entry(struct inode *inode, const char *name, int len) {
        struct buffer_head *bh;
@@ -64,9 +66,10 @@ struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, struct namei
        lock_kernel();
        inodenum = efs_find_entry(dir, dentry->d_name.name, dentry->d_name.len);
        if (inodenum) {
-               if (!(inode = iget(dir->i_sb, inodenum))) {
+               inode = efs_iget(dir->i_sb, inodenum);
+               if (IS_ERR(inode)) {
                        unlock_kernel();
-                       return ERR_PTR(-EACCES);
+                       return ERR_CAST(inode);
                }
        }
        unlock_kernel();
@@ -75,36 +78,37 @@ struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, struct namei
        return NULL;
 }
 
-struct dentry *efs_get_dentry(struct super_block *sb, void *vobjp)
+static struct inode *efs_nfs_get_inode(struct super_block *sb, u64 ino,
+               u32 generation)
 {
-       __u32 *objp = vobjp;
-       unsigned long ino = objp[0];
-       __u32 generation = objp[1];
        struct inode *inode;
-       struct dentry *result;
 
        if (ino == 0)
                return ERR_PTR(-ESTALE);
-       inode = iget(sb, ino);
-       if (inode == NULL)
-               return ERR_PTR(-ENOMEM);
-
-       if (is_bad_inode(inode) ||
-           (generation && inode->i_generation != generation)) {
-               result = ERR_PTR(-ESTALE);
-               goto out_iput;
-       }
+       inode = efs_iget(sb, ino);
+       if (IS_ERR(inode))
+               return ERR_CAST(inode);
 
-       result = d_alloc_anon(inode);
-       if (!result) {
-               result = ERR_PTR(-ENOMEM);
-               goto out_iput;
+       if (generation && inode->i_generation != generation) {
+               iput(inode);
+               return ERR_PTR(-ESTALE);
        }
-       return result;
 
- out_iput:
-       iput(inode);
-       return result;
+       return inode;
+}
+
+struct dentry *efs_fh_to_dentry(struct super_block *sb, struct fid *fid,
+               int fh_len, int fh_type)
+{
+       return generic_fh_to_dentry(sb, fid, fh_len, fh_type,
+                                   efs_nfs_get_inode);
+}
+
+struct dentry *efs_fh_to_parent(struct super_block *sb, struct fid *fid,
+               int fh_len, int fh_type)
+{
+       return generic_fh_to_parent(sb, fid, fh_len, fh_type,
+                                   efs_nfs_get_inode);
 }
 
 struct dentry *efs_get_parent(struct dentry *child)
@@ -112,7 +116,7 @@ struct dentry *efs_get_parent(struct dentry *child)
        struct dentry *parent;
        struct inode *inode;
        efs_ino_t ino;
-       int error;
+       long error;
 
        lock_kernel();
 
@@ -121,10 +125,11 @@ struct dentry *efs_get_parent(struct dentry *child)
        if (!ino)
                goto fail;
 
-       error = -EACCES;
-       inode = iget(child->d_inode->i_sb, ino);
-       if (!inode)
+       inode = efs_iget(child->d_inode->i_sb, ino);
+       if (IS_ERR(inode)) {
+               error = PTR_ERR(inode);
                goto fail;
+       }
 
        error = -ENOMEM;
        parent = d_alloc_anon(inode);