diff options
Diffstat (limited to 'fs/udf/super.c')
-rw-r--r-- | fs/udf/super.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c index 441b892cf85e..536f89da4af2 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c | |||
@@ -48,7 +48,6 @@ | |||
48 | #include <linux/stat.h> | 48 | #include <linux/stat.h> |
49 | #include <linux/cdrom.h> | 49 | #include <linux/cdrom.h> |
50 | #include <linux/nls.h> | 50 | #include <linux/nls.h> |
51 | #include <linux/smp_lock.h> | ||
52 | #include <linux/buffer_head.h> | 51 | #include <linux/buffer_head.h> |
53 | #include <linux/vfs.h> | 52 | #include <linux/vfs.h> |
54 | #include <linux/vmalloc.h> | 53 | #include <linux/vmalloc.h> |
@@ -1911,8 +1910,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent) | |||
1911 | struct kernel_lb_addr rootdir, fileset; | 1910 | struct kernel_lb_addr rootdir, fileset; |
1912 | struct udf_sb_info *sbi; | 1911 | struct udf_sb_info *sbi; |
1913 | 1912 | ||
1914 | lock_kernel(); | ||
1915 | |||
1916 | uopt.flags = (1 << UDF_FLAG_USE_AD_IN_ICB) | (1 << UDF_FLAG_STRICT); | 1913 | uopt.flags = (1 << UDF_FLAG_USE_AD_IN_ICB) | (1 << UDF_FLAG_STRICT); |
1917 | uopt.uid = -1; | 1914 | uopt.uid = -1; |
1918 | uopt.gid = -1; | 1915 | uopt.gid = -1; |
@@ -1921,10 +1918,8 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent) | |||
1921 | uopt.dmode = UDF_INVALID_MODE; | 1918 | uopt.dmode = UDF_INVALID_MODE; |
1922 | 1919 | ||
1923 | sbi = kzalloc(sizeof(struct udf_sb_info), GFP_KERNEL); | 1920 | sbi = kzalloc(sizeof(struct udf_sb_info), GFP_KERNEL); |
1924 | if (!sbi) { | 1921 | if (!sbi) |
1925 | unlock_kernel(); | ||
1926 | return -ENOMEM; | 1922 | return -ENOMEM; |
1927 | } | ||
1928 | 1923 | ||
1929 | sb->s_fs_info = sbi; | 1924 | sb->s_fs_info = sbi; |
1930 | 1925 | ||
@@ -2071,7 +2066,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent) | |||
2071 | goto error_out; | 2066 | goto error_out; |
2072 | } | 2067 | } |
2073 | sb->s_maxbytes = MAX_LFS_FILESIZE; | 2068 | sb->s_maxbytes = MAX_LFS_FILESIZE; |
2074 | unlock_kernel(); | ||
2075 | return 0; | 2069 | return 0; |
2076 | 2070 | ||
2077 | error_out: | 2071 | error_out: |
@@ -2092,7 +2086,6 @@ error_out: | |||
2092 | kfree(sbi); | 2086 | kfree(sbi); |
2093 | sb->s_fs_info = NULL; | 2087 | sb->s_fs_info = NULL; |
2094 | 2088 | ||
2095 | unlock_kernel(); | ||
2096 | return -EINVAL; | 2089 | return -EINVAL; |
2097 | } | 2090 | } |
2098 | 2091 | ||