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 c3fb5f9..1511bf9 100644 (file)
--- a/fs/efs/namei.c
+++ b/fs/efs/namei.c
@@ -8,7 +8,6 @@
 
 #include <linux/buffer_head.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/exportfs.h>
 #include "efs.h"
 
@@ -63,16 +62,12 @@ 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();
 
        return d_splice_alias(inode, dentry);
 }
@@ -115,11 +110,9 @@ struct dentry *efs_get_parent(struct dentry *child)
        struct dentry *parent = ERR_PTR(-ENOENT);
        efs_ino_t ino;
 
-       lock_kernel();
        ino = efs_find_entry(child->d_inode, "..", 2);
        if (ino)
                parent = d_obtain_alias(efs_iget(child->d_inode->i_sb, ino));
-       unlock_kernel();
 
        return parent;
 }