X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Fsysv%2Fnamei.c;h=a1f1ef33e81c4c5584a86630ca1bca637b078fea;hb=a993b542bb4cd3e5a64863b7ef892bbebec2239b;hp=f7c08db8e34c80225000cd10b7722e5d8ef82eb6;hpb=95f3eff6997ae4a6754c1d874ec0a414d97c44d1;p=linux-2.6-omap-h63xx.git

diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c
index f7c08db8e34..a1f1ef33e81 100644
--- a/fs/sysv/namei.c
+++ b/fs/sysv/namei.c
@@ -13,7 +13,6 @@
  */
 
 #include <linux/pagemap.h>
-#include <linux/smp_lock.h>
 #include "sysv.h"
 
 static int add_nondir(struct dentry *dentry, struct inode *inode)
@@ -54,9 +53,9 @@ static struct dentry *sysv_lookup(struct inode * dir, struct dentry * dentry, st
 	ino = sysv_inode_by_name(dentry);
 
 	if (ino) {
-		inode = iget(dir->i_sb, ino);
-		if (!inode)
-			return ERR_PTR(-EACCES);
+		inode = sysv_iget(dir->i_sb, ino);
+		if (IS_ERR(inode))
+			return ERR_CAST(inode);
 	}
 	d_add(dentry, inode);
 	return NULL;
@@ -292,7 +291,7 @@ out:
 /*
  * directories can handle most operations...
  */
-struct inode_operations sysv_dir_inode_operations = {
+const struct inode_operations sysv_dir_inode_operations = {
 	.create		= sysv_create,
 	.lookup		= sysv_lookup,
 	.link		= sysv_link,