Merge branch 'master' of /usr/src/ntfs-2.6/

3 files changed, 11 insertions, 16 deletions

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 8a8c34461d48..b638fb500743 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -533,7 +533,7 @@ static void proc_kill_inodes(struct proc_dir_entry *de)
          */
         file_list_lock();
         list_for_each(p, &sb->s_files) {
-                struct file * filp = list_entry(p, struct file, f_list);
+                struct file * filp = list_entry(p, struct file, f_u.fu_list);
                 struct dentry * dentry = filp->f_dentry;
                 struct inode * inode;
                 struct file_operations *fops;
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index effa6c0c467a..e6a818a93f3d 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -156,10 +156,13 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
 
         WARN_ON(de && de->deleted);
 
+        if (de != NULL && !try_module_get(de->owner))
+                goto out_mod;
+
         inode = iget(sb, ino);
         if (!inode)
-                goto out_fail;
-        
+                goto out_ino;
+
         PROC_I(inode)->pde = de;
         if (de) {
                 if (de->mode) {
@@ -171,20 +174,20 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
                         inode->i_size = de->size;
                 if (de->nlink)
                         inode->i_nlink = de->nlink;
-                if (!try_module_get(de->owner))
-                        goto out_fail;
                 if (de->proc_iops)
                         inode->i_op = de->proc_iops;
                 if (de->proc_fops)
                         inode->i_fop = de->proc_fops;
         }
 
-out:
         return inode;
 
-out_fail:
+out_ino:
+        if (de != NULL)
+                module_put(de->owner);
+out_mod:
         de_put(de);
-        goto out;
+        return NULL;
 }                       
 
 int proc_fill_super(struct super_block *s, void *data, int silent)
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index a3453555a94e..5b6b0b6038a7 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -629,12 +629,4 @@ void __init proc_misc_init(void)
         if (entry)
                 entry->proc_fops = &proc_sysrq_trigger_operations;
 #endif
-#ifdef CONFIG_PPC32
-        {
-                extern struct file_operations ppc_htab_operations;
-                entry = create_proc_entry("ppc_htab", S_IRUGO|S_IWUSR, NULL);
-                if (entry)
-                        entry->proc_fops = &ppc_htab_operations;
-        }
-#endif
 }