Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c

3 files changed, 15 insertions, 15 deletions

diff --git a/fs/coda/dir.c b/fs/coda/dir.c
index 0102b28a15..0c6f7f3b3d 100644
--- a/fs/coda/dir.c
+++ b/fs/coda/dir.c
@@ -441,7 +441,7 @@ static int coda_rename(struct inode *old_dir, struct dentry *old_dentry,
 /* file operations for directories */
 int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
 {
-        struct dentry *coda_dentry = coda_file->f_dentry;
+        struct dentry *coda_dentry = coda_file->f_path.dentry;
         struct coda_file_info *cfi;
         struct file *host_file;
         struct inode *host_inode;
@@ -453,7 +453,7 @@ int coda_readdir(struct file *coda_file, void *dirent, filldir_t filldir)
 
         coda_vfs_stat.readdir++;
 
-        host_inode = host_file->f_dentry->d_inode;
+        host_inode = host_file->f_path.dentry->d_inode;
         mutex_lock(&host_inode->i_mutex);
         host_file->f_pos = coda_file->f_pos;
 
@@ -544,14 +544,14 @@ static int coda_venus_readdir(struct file *filp, filldir_t filldir,
                 /* catch truncated reads */
                 if (ret < vdir_size || ret < vdir_size + vdir->d_namlen) {
                         printk("coda_venus_readdir: short read: %ld\n",
-                               filp->f_dentry->d_inode->i_ino);
+                               filp->f_path.dentry->d_inode->i_ino);
                         ret = -EBADF;
                         break;
                 }
                 /* validate whether the directory file actually makes sense */
                 if (vdir->d_reclen < vdir_size + vdir->d_namlen) {
                         printk("coda_venus_readdir: Invalid dir: %ld\n",
-                               filp->f_dentry->d_inode->i_ino);
+                               filp->f_path.dentry->d_inode->i_ino);
                         ret = -EBADF;
                         break;
                 }
diff --git a/fs/coda/file.c b/fs/coda/file.c
index dbfbcfa5b3..5ef2b609ec 100644
--- a/fs/coda/file.c
+++ b/fs/coda/file.c
@@ -66,7 +66,7 @@ coda_file_sendfile(struct file *coda_file, loff_t *ppos, size_t count,
 static ssize_t
 coda_file_write(struct file *coda_file, const char __user *buf, size_t count, loff_t *ppos)
 {
-        struct inode *host_inode, *coda_inode = coda_file->f_dentry->d_inode;
+        struct inode *host_inode, *coda_inode = coda_file->f_path.dentry->d_inode;
         struct coda_file_info *cfi;
         struct file *host_file;
         ssize_t ret;
@@ -78,7 +78,7 @@ coda_file_write(struct file *coda_file, const char __user *buf, size_t count, lo
         if (!host_file->f_op || !host_file->f_op->write)
                 return -EINVAL;
 
-        host_inode = host_file->f_dentry->d_inode;
+        host_inode = host_file->f_path.dentry->d_inode;
         mutex_lock(&coda_inode->i_mutex);
 
         ret = host_file->f_op->write(host_file, buf, count, ppos);
@@ -106,8 +106,8 @@ coda_file_mmap(struct file *coda_file, struct vm_area_struct *vma)
         if (!host_file->f_op || !host_file->f_op->mmap)
                 return -ENODEV;
 
-        coda_inode = coda_file->f_dentry->d_inode;
-        host_inode = host_file->f_dentry->d_inode;
+        coda_inode = coda_file->f_path.dentry->d_inode;
+        host_inode = host_file->f_path.dentry->d_inode;
         coda_file->f_mapping = host_file->f_mapping;
         if (coda_inode->i_mapping == &coda_inode->i_data)
                 coda_inode->i_mapping = host_inode->i_mapping;
@@ -190,7 +190,7 @@ int coda_flush(struct file *coda_file, fl_owner_t id)
         cfi = CODA_FTOC(coda_file);
         BUG_ON(!cfi || cfi->cfi_magic != CODA_MAGIC);
 
-        coda_inode = coda_file->f_dentry->d_inode;
+        coda_inode = coda_file->f_path.dentry->d_inode;
 
         err = venus_store(coda_inode->i_sb, coda_i2f(coda_inode), coda_flags,
                           coda_file->f_uid);
@@ -233,7 +233,7 @@ int coda_release(struct inode *coda_inode, struct file *coda_file)
                 err = venus_close(coda_inode->i_sb, coda_i2f(coda_inode),
                                   coda_flags, coda_file->f_uid);
 
-        host_inode = cfi->cfi_container->f_dentry->d_inode;
+        host_inode = cfi->cfi_container->f_path.dentry->d_inode;
         cii = ITOC(coda_inode);
 
         /* did we mmap this file? */
@@ -270,7 +270,7 @@ int coda_fsync(struct file *coda_file, struct dentry *coda_dentry, int datasync)
         coda_vfs_stat.fsync++;
 
         if (host_file->f_op && host_file->f_op->fsync) {
-                host_dentry = host_file->f_dentry;
+                host_dentry = host_file->f_path.dentry;
                 host_inode = host_dentry->d_inode;
                 mutex_lock(&host_inode->i_mutex);
                 err = host_file->f_op->fsync(host_file, host_dentry, datasync);
diff --git a/fs/coda/inode.c b/fs/coda/inode.c
index 88d1233211..01395defed 100644
--- a/fs/coda/inode.c
+++ b/fs/coda/inode.c
@@ -38,12 +38,12 @@ static void coda_clear_inode(struct inode *);
 static void coda_put_super(struct super_block *);
 static int coda_statfs(struct dentry *dentry, struct kstatfs *buf);
 
-static kmem_cache_t * coda_inode_cachep;
+static struct kmem_cache * coda_inode_cachep;
 
 static struct inode *coda_alloc_inode(struct super_block *sb)
 {
         struct coda_inode_info *ei;
-        ei = (struct coda_inode_info *)kmem_cache_alloc(coda_inode_cachep, SLAB_KERNEL);
+        ei = (struct coda_inode_info *)kmem_cache_alloc(coda_inode_cachep, GFP_KERNEL);
         if (!ei)
                 return NULL;
         memset(&ei->c_fid, 0, sizeof(struct CodaFid));
@@ -58,7 +58,7 @@ static void coda_destroy_inode(struct inode *inode)
         kmem_cache_free(coda_inode_cachep, ITOC(inode));
 }
 
-static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
+static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flags)
 {
         struct coda_inode_info *ei = (struct coda_inode_info *) foo;
 
@@ -119,7 +119,7 @@ static int get_device_index(struct coda_mount_data *data)
         file = fget(data->fd);
         inode = NULL;
         if(file)
-                inode = file->f_dentry->d_inode;
+                inode = file->f_path.dentry->d_inode;
         
         if(!inode || !S_ISCHR(inode->i_mode) ||
            imajor(inode) != CODA_PSDEV_MAJOR) {