aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/file.c3
-rw-r--r--fs/ecryptfs/main.c4
2 files changed, 0 insertions, 7 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 622c95140802..2b9a644b7583 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -31,7 +31,6 @@
31#include <linux/security.h> 31#include <linux/security.h>
32#include <linux/compat.h> 32#include <linux/compat.h>
33#include <linux/fs_stack.h> 33#include <linux/fs_stack.h>
34#include <linux/smp_lock.h>
35#include "ecryptfs_kernel.h" 34#include "ecryptfs_kernel.h"
36 35
37/** 36/**
@@ -284,11 +283,9 @@ static int ecryptfs_fasync(int fd, struct file *file, int flag)
284 int rc = 0; 283 int rc = 0;
285 struct file *lower_file = NULL; 284 struct file *lower_file = NULL;
286 285
287 lock_kernel();
288 lower_file = ecryptfs_file_to_lower(file); 286 lower_file = ecryptfs_file_to_lower(file);
289 if (lower_file->f_op && lower_file->f_op->fasync) 287 if (lower_file->f_op && lower_file->f_op->fasync)
290 rc = lower_file->f_op->fasync(fd, lower_file, flag); 288 rc = lower_file->f_op->fasync(fd, lower_file, flag);
291 unlock_kernel();
292 return rc; 289 return rc;
293} 290}
294 291
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index c4af92fa12c3..cbd4e18adb20 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -36,7 +36,6 @@
36#include <linux/parser.h> 36#include <linux/parser.h>
37#include <linux/fs_stack.h> 37#include <linux/fs_stack.h>
38#include <linux/slab.h> 38#include <linux/slab.h>
39#include <linux/smp_lock.h> /* For lock_kernel() */
40#include "ecryptfs_kernel.h" 39#include "ecryptfs_kernel.h"
41 40
42/** 41/**
@@ -551,7 +550,6 @@ static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags,
551 const char *err = "Getting sb failed"; 550 const char *err = "Getting sb failed";
552 int rc; 551 int rc;
553 552
554 lock_kernel();
555 sbi = kmem_cache_zalloc(ecryptfs_sb_info_cache, GFP_KERNEL); 553 sbi = kmem_cache_zalloc(ecryptfs_sb_info_cache, GFP_KERNEL);
556 if (!sbi) { 554 if (!sbi) {
557 rc = -ENOMEM; 555 rc = -ENOMEM;
@@ -610,7 +608,6 @@ static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags,
610 goto out; 608 goto out;
611 } 609 }
612 simple_set_mnt(mnt, s); 610 simple_set_mnt(mnt, s);
613 unlock_kernel();
614 return 0; 611 return 0;
615 612
616out: 613out:
@@ -619,7 +616,6 @@ out:
619 kmem_cache_free(ecryptfs_sb_info_cache, sbi); 616 kmem_cache_free(ecryptfs_sb_info_cache, sbi);
620 } 617 }
621 printk(KERN_ERR "%s; rc = [%d]\n", err, rc); 618 printk(KERN_ERR "%s; rc = [%d]\n", err, rc);
622 unlock_kernel();
623 return rc; 619 return rc;
624} 620}
625 621