NFS: Switch from intr mount option to TASK_KILLABLE
By using the TASK_KILLABLE infrastructure, we can get rid of the 'intr' mount option. We have to use _killable everywhere instead of _interruptible as we get rid of rpc_clnt_sigmask/sigunmask. Signed-off-by: Liam R. Howlett <howlett@gmail.com> Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
This commit is contained in:
committed by
Matthew Wilcox
parent
009e577e07
commit
150030b78a
@@ -433,15 +433,11 @@ static int nfs_wait_schedule(void *word)
|
||||
*/
|
||||
static int nfs_wait_on_inode(struct inode *inode)
|
||||
{
|
||||
struct rpc_clnt *clnt = NFS_CLIENT(inode);
|
||||
struct nfs_inode *nfsi = NFS_I(inode);
|
||||
sigset_t oldmask;
|
||||
int error;
|
||||
|
||||
rpc_clnt_sigmask(clnt, &oldmask);
|
||||
error = wait_on_bit_lock(&nfsi->flags, NFS_INO_REVALIDATING,
|
||||
nfs_wait_schedule, TASK_INTERRUPTIBLE);
|
||||
rpc_clnt_sigunmask(clnt, &oldmask);
|
||||
nfs_wait_schedule, TASK_KILLABLE);
|
||||
|
||||
return error;
|
||||
}
|
||||
|
Reference in New Issue
Block a user