diff options
Diffstat (limited to 'fs/cifs/connect.c')
-rw-r--r-- | fs/cifs/connect.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 20d75b8ddb26..b98366f21f9e 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -3934,13 +3934,6 @@ cifs_sb_master_tcon(struct cifs_sb_info *cifs_sb) | |||
3934 | return tlink_tcon(cifs_sb_master_tlink(cifs_sb)); | 3934 | return tlink_tcon(cifs_sb_master_tlink(cifs_sb)); |
3935 | } | 3935 | } |
3936 | 3936 | ||
3937 | static int | ||
3938 | cifs_sb_tcon_pending_wait(void *unused) | ||
3939 | { | ||
3940 | schedule(); | ||
3941 | return signal_pending(current) ? -ERESTARTSYS : 0; | ||
3942 | } | ||
3943 | |||
3944 | /* find and return a tlink with given uid */ | 3937 | /* find and return a tlink with given uid */ |
3945 | static struct tcon_link * | 3938 | static struct tcon_link * |
3946 | tlink_rb_search(struct rb_root *root, kuid_t uid) | 3939 | tlink_rb_search(struct rb_root *root, kuid_t uid) |
@@ -4039,11 +4032,10 @@ cifs_sb_tlink(struct cifs_sb_info *cifs_sb) | |||
4039 | } else { | 4032 | } else { |
4040 | wait_for_construction: | 4033 | wait_for_construction: |
4041 | ret = wait_on_bit(&tlink->tl_flags, TCON_LINK_PENDING, | 4034 | ret = wait_on_bit(&tlink->tl_flags, TCON_LINK_PENDING, |
4042 | cifs_sb_tcon_pending_wait, | ||
4043 | TASK_INTERRUPTIBLE); | 4035 | TASK_INTERRUPTIBLE); |
4044 | if (ret) { | 4036 | if (ret) { |
4045 | cifs_put_tlink(tlink); | 4037 | cifs_put_tlink(tlink); |
4046 | return ERR_PTR(ret); | 4038 | return ERR_PTR(-ERESTARTSYS); |
4047 | } | 4039 | } |
4048 | 4040 | ||
4049 | /* if it's good, return it */ | 4041 | /* if it's good, return it */ |