mm: migration: avoid race between shift_arg_pages() and rmap_walk() during migration...

[safe/jmp/linux-2.6] / fs / efs / namei.c

diff --git a/fs/efs/namei.c b/fs/efs/namei.c
index e267047..1511bf9 100644 (file)
--- a/fs/efs/namei.c
+++ b/fs/efs/namei.c
@@ -8,9 +8,8 @@
 
 #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) {
@@ -63,19 +62,14 @@ struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, struct namei
        efs_ino_t inodenum;
        struct inode * inode = NULL;
 
-       lock_kernel();
        inodenum = efs_find_entry(dir, dentry->d_name.name, dentry->d_name.len);
        if (inodenum) {
                inode = efs_iget(dir->i_sb, inodenum);
-               if (IS_ERR(inode)) {
-                       unlock_kernel();
+               if (IS_ERR(inode))
                        return ERR_CAST(inode);
-               }
        }
-       unlock_kernel();
 
-       d_add(dentry, inode);
-       return NULL;
+       return d_splice_alias(inode, dentry);
 }
 
 static struct inode *efs_nfs_get_inode(struct super_block *sb, u64 ino,
@@ -113,35 +107,12 @@ struct dentry *efs_fh_to_parent(struct super_block *sb, struct fid *fid,
 
 struct dentry *efs_get_parent(struct dentry *child)
 {
-       struct dentry *parent;
-       struct inode *inode;
+       struct dentry *parent = ERR_PTR(-ENOENT);
        efs_ino_t ino;
-       long error;
 
-       lock_kernel();
-
-       error = -ENOENT;
        ino = efs_find_entry(child->d_inode, "..", 2);
-       if (!ino)
-               goto fail;
+       if (ino)
+               parent = d_obtain_alias(efs_iget(child->d_inode->i_sb, ino));
 
-       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);
-       if (!parent)
-               goto fail_iput;
-
-       unlock_kernel();
        return parent;
-
- fail_iput:
-       iput(inode);
- fail:
-       unlock_kernel();
-       return ERR_PTR(error);
 }