diff options
author | Matthew Wilcox <matthew@wil.cx> | 2007-12-06 16:24:39 -0500 |
---|---|---|
committer | Matthew Wilcox <willy@linux.intel.com> | 2007-12-06 17:40:25 -0500 |
commit | 150030b78a454ba50d5e267b0dcf01b162809192 (patch) | |
tree | 4de766e7abbfd73a052f14f8efd3a26eb7b59d87 /fs/nfs/super.c | |
parent | 009e577e079656d51d0fe9b15e61e41b00816c29 (diff) |
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>
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r-- | fs/nfs/super.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 2426e713b77f..5b6339f70a4c 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -424,7 +424,6 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss, | |||
424 | const char *nostr; | 424 | const char *nostr; |
425 | } nfs_info[] = { | 425 | } nfs_info[] = { |
426 | { NFS_MOUNT_SOFT, ",soft", ",hard" }, | 426 | { NFS_MOUNT_SOFT, ",soft", ",hard" }, |
427 | { NFS_MOUNT_INTR, ",intr", ",nointr" }, | ||
428 | { NFS_MOUNT_NOCTO, ",nocto", "" }, | 427 | { NFS_MOUNT_NOCTO, ",nocto", "" }, |
429 | { NFS_MOUNT_NOAC, ",noac", "" }, | 428 | { NFS_MOUNT_NOAC, ",noac", "" }, |
430 | { NFS_MOUNT_NONLM, ",nolock", "" }, | 429 | { NFS_MOUNT_NONLM, ",nolock", "" }, |
@@ -624,10 +623,7 @@ static int nfs_parse_mount_options(char *raw, | |||
624 | mnt->flags &= ~NFS_MOUNT_SOFT; | 623 | mnt->flags &= ~NFS_MOUNT_SOFT; |
625 | break; | 624 | break; |
626 | case Opt_intr: | 625 | case Opt_intr: |
627 | mnt->flags |= NFS_MOUNT_INTR; | ||
628 | break; | ||
629 | case Opt_nointr: | 626 | case Opt_nointr: |
630 | mnt->flags &= ~NFS_MOUNT_INTR; | ||
631 | break; | 627 | break; |
632 | case Opt_posix: | 628 | case Opt_posix: |
633 | mnt->flags |= NFS_MOUNT_POSIX; | 629 | mnt->flags |= NFS_MOUNT_POSIX; |