Clean up duplicate includes in fs/ecryptfs/

[cascardo/linux.git] / fs / file_table.c

diff --git a/fs/file_table.c b/fs/file_table.c
index 4c17a18..ce3f39a 100644 (file)
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -10,7 +10,6 @@
 #include <linux/file.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/smp_lock.h>
 #include <linux/fs.h>
 #include <linux/security.h>
 #include <linux/eventpoll.h>
@@ -99,16 +98,15 @@ struct file *get_empty_filp(void)
                 * percpu_counters are inaccurate.  Do an expensive check before
                 * we go and fail.
                 */
-               if (percpu_counter_sum(&nr_files) >= files_stat.max_files)
+               if (percpu_counter_sum_positive(&nr_files) >= files_stat.max_files)
                        goto over;
        }
 
-       f = kmem_cache_alloc(filp_cachep, GFP_KERNEL);
+       f = kmem_cache_zalloc(filp_cachep, GFP_KERNEL);
        if (f == NULL)
                goto fail;
 
        percpu_counter_inc(&nr_files);
-       memset(f, 0, sizeof(*f));
        if (security_file_alloc(f))
                goto fail_sec;