Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
xcap
xcap-capability-linux
Commits
a9a80178
Commit
a9a80178
authored
Mar 20, 2006
by
Trond Myklebust
Browse files
NFS, NLM: Allow blocking locks to respect signals
Signed-off-by:
Trond Myklebust
<
Trond.Myklebust@netapp.com
>
parent
03f28e3a
Changes
1
Hide whitespace changes
Inline
Side-by-side
fs/nfs/file.c
View file @
a9a80178
...
...
@@ -443,10 +443,8 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl)
static
int
do_unlk
(
struct
file
*
filp
,
int
cmd
,
struct
file_lock
*
fl
)
{
struct
inode
*
inode
=
filp
->
f_mapping
->
host
;
sigset_t
oldset
;
int
status
;
rpc_clnt_sigmask
(
NFS_CLIENT
(
inode
),
&
oldset
);
/*
* Flush all pending writes before doing anything
* with locks..
...
...
@@ -464,17 +462,14 @@ static int do_unlk(struct file *filp, int cmd, struct file_lock *fl)
else
status
=
do_vfs_lock
(
filp
,
fl
);
unlock_kernel
();
rpc_clnt_sigunmask
(
NFS_CLIENT
(
inode
),
&
oldset
);
return
status
;
}
static
int
do_setlk
(
struct
file
*
filp
,
int
cmd
,
struct
file_lock
*
fl
)
{
struct
inode
*
inode
=
filp
->
f_mapping
->
host
;
sigset_t
oldset
;
int
status
;
rpc_clnt_sigmask
(
NFS_CLIENT
(
inode
),
&
oldset
);
/*
* Flush all pending writes before doing anything
* with locks..
...
...
@@ -507,7 +502,6 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl)
nfs_sync_mapping
(
filp
->
f_mapping
);
nfs_zap_caches
(
inode
);
out:
rpc_clnt_sigunmask
(
NFS_CLIENT
(
inode
),
&
oldset
);
return
status
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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