X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Ffcntl.c;h=2bdaef35da5479a406aa1eb658eba498c145c4c7;hb=ff273773bfd4f2131bad1318e56519fcceac2339;hp=c03dc9cb21cb1582762e1fa29119ca6ecf2afbea;hpb=e94b1766097d53e6f3ccfb36c8baa562ffeda3fc;p=linux-2.6

diff --git a/fs/fcntl.c b/fs/fcntl.c
index c03dc9cb21..2bdaef35da 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -204,7 +204,7 @@ asmlinkage long sys_dup(unsigned int fildes)
 
 static int setfl(int fd, struct file * filp, unsigned long arg)
 {
-	struct inode * inode = filp->f_dentry->d_inode;
+	struct inode * inode = filp->f_path.dentry->d_inode;
 	int error = 0;
 
 	/*
@@ -553,7 +553,7 @@ int send_sigurg(struct fown_struct *fown)
 }
 
 static DEFINE_RWLOCK(fasync_lock);
-static kmem_cache_t *fasync_cache __read_mostly;
+static struct kmem_cache *fasync_cache __read_mostly;
 
 /*
  * fasync_helper() is used by some character device drivers (mainly mice)