Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
5ac3455a
Commit
5ac3455a
authored
Jun 16, 2009
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get rid of BKL in fs/sysv
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
cc46759a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
15 deletions
+1
-15
fs/sysv/dir.c
fs/sysv/dir.c
+1
-4
fs/sysv/inode.c
fs/sysv/inode.c
+0
-11
No files found.
fs/sysv/dir.c
View file @
5ac3455a
...
...
@@ -15,13 +15,13 @@
#include <linux/pagemap.h>
#include <linux/highmem.h>
#include <linux/smp_lock.h>
#include <linux/swap.h>
#include "sysv.h"
static
int
sysv_readdir
(
struct
file
*
,
void
*
,
filldir_t
);
const
struct
file_operations
sysv_dir_operations
=
{
.
llseek
=
generic_file_llseek
,
.
read
=
generic_read_dir
,
.
readdir
=
sysv_readdir
,
.
fsync
=
simple_fsync
,
...
...
@@ -74,8 +74,6 @@ static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
unsigned
long
n
=
pos
>>
PAGE_CACHE_SHIFT
;
unsigned
long
npages
=
dir_pages
(
inode
);
lock_kernel
();
pos
=
(
pos
+
SYSV_DIRSIZE
-
1
)
&
~
(
SYSV_DIRSIZE
-
1
);
if
(
pos
>=
inode
->
i_size
)
goto
done
;
...
...
@@ -113,7 +111,6 @@ static int sysv_readdir(struct file * filp, void * dirent, filldir_t filldir)
done:
filp
->
f_pos
=
((
loff_t
)
n
<<
PAGE_CACHE_SHIFT
)
|
offset
;
unlock_kernel
();
return
0
;
}
...
...
fs/sysv/inode.c
View file @
5ac3455a
...
...
@@ -21,7 +21,6 @@
* the superblock.
*/
#include <linux/smp_lock.h>
#include <linux/highuid.h>
#include <linux/slab.h>
#include <linux/init.h>
...
...
@@ -37,7 +36,6 @@ static int sysv_sync_fs(struct super_block *sb, int wait)
unsigned
long
time
=
get_seconds
(),
old_time
;
lock_super
(
sb
);
lock_kernel
();
/*
* If we are going to write out the super block,
...
...
@@ -52,7 +50,6 @@ static int sysv_sync_fs(struct super_block *sb, int wait)
mark_buffer_dirty
(
sbi
->
s_bh2
);
}
unlock_kernel
();
unlock_super
(
sb
);
return
0
;
...
...
@@ -82,8 +79,6 @@ static void sysv_put_super(struct super_block *sb)
{
struct
sysv_sb_info
*
sbi
=
SYSV_SB
(
sb
);
lock_kernel
();
if
(
sb
->
s_dirt
)
sysv_write_super
(
sb
);
...
...
@@ -99,8 +94,6 @@ static void sysv_put_super(struct super_block *sb)
brelse
(
sbi
->
s_bh2
);
kfree
(
sbi
);
unlock_kernel
();
}
static
int
sysv_statfs
(
struct
dentry
*
dentry
,
struct
kstatfs
*
buf
)
...
...
@@ -275,7 +268,6 @@ int sysv_write_inode(struct inode *inode, int wait)
return
-
EIO
;
}
lock_kernel
();
raw_inode
->
i_mode
=
cpu_to_fs16
(
sbi
,
inode
->
i_mode
);
raw_inode
->
i_uid
=
cpu_to_fs16
(
sbi
,
fs_high2lowuid
(
inode
->
i_uid
));
raw_inode
->
i_gid
=
cpu_to_fs16
(
sbi
,
fs_high2lowgid
(
inode
->
i_gid
));
...
...
@@ -291,7 +283,6 @@ int sysv_write_inode(struct inode *inode, int wait)
for
(
block
=
0
;
block
<
10
+
1
+
1
+
1
;
block
++
)
write3byte
(
sbi
,
(
u8
*
)
&
si
->
i_data
[
block
],
&
raw_inode
->
i_data
[
3
*
block
]);
unlock_kernel
();
mark_buffer_dirty
(
bh
);
if
(
wait
)
{
sync_dirty_buffer
(
bh
);
...
...
@@ -315,9 +306,7 @@ static void sysv_delete_inode(struct inode *inode)
truncate_inode_pages
(
&
inode
->
i_data
,
0
);
inode
->
i_size
=
0
;
sysv_truncate
(
inode
);
lock_kernel
();
sysv_free_inode
(
inode
);
unlock_kernel
();
}
static
struct
kmem_cache
*
sysv_inode_cachep
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment