diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /fs/cifs/connect.c | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'fs/cifs/connect.c')
| -rw-r--r-- | fs/cifs/connect.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index e93da7ad9002..4af3588c1a96 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
| @@ -364,6 +364,7 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server) | |||
| 364 | GFP_KERNEL); | 364 | GFP_KERNEL); |
| 365 | } | 365 | } |
| 366 | 366 | ||
| 367 | set_freezable(); | ||
| 367 | while (!kthread_should_stop()) { | 368 | while (!kthread_should_stop()) { |
| 368 | if (try_to_freeze()) | 369 | if (try_to_freeze()) |
| 369 | continue; | 370 | continue; |