aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsfs.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-07-18 20:38:57 -0400
committerSteve French <sfrench@us.ibm.com>2007-07-18 20:38:57 -0400
commit1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch)
tree860b95e9a499ade4060848740fc6ce1fbb4e4e8d /fs/cifs/cifsfs.c
parent70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff)
parent5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: fs/cifs/export.c
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r--fs/cifs/cifsfs.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 1cebb7e34215..1fd0dc85f53c 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -623,7 +623,7 @@ const struct file_operations cifs_file_ops = {
623 .fsync = cifs_fsync, 623 .fsync = cifs_fsync,
624 .flush = cifs_flush, 624 .flush = cifs_flush,
625 .mmap = cifs_file_mmap, 625 .mmap = cifs_file_mmap,
626 .sendfile = generic_file_sendfile, 626 .splice_read = generic_file_splice_read,
627 .llseek = cifs_llseek, 627 .llseek = cifs_llseek,
628#ifdef CONFIG_CIFS_POSIX 628#ifdef CONFIG_CIFS_POSIX
629 .ioctl = cifs_ioctl, 629 .ioctl = cifs_ioctl,
@@ -644,7 +644,7 @@ const struct file_operations cifs_file_direct_ops = {
644 .lock = cifs_lock, 644 .lock = cifs_lock,
645 .fsync = cifs_fsync, 645 .fsync = cifs_fsync,
646 .flush = cifs_flush, 646 .flush = cifs_flush,
647 .sendfile = generic_file_sendfile, /* BB removeme BB */ 647 .splice_read = generic_file_splice_read,
648#ifdef CONFIG_CIFS_POSIX 648#ifdef CONFIG_CIFS_POSIX
649 .ioctl = cifs_ioctl, 649 .ioctl = cifs_ioctl,
650#endif /* CONFIG_CIFS_POSIX */ 650#endif /* CONFIG_CIFS_POSIX */
@@ -663,7 +663,7 @@ const struct file_operations cifs_file_nobrl_ops = {
663 .fsync = cifs_fsync, 663 .fsync = cifs_fsync,
664 .flush = cifs_flush, 664 .flush = cifs_flush,
665 .mmap = cifs_file_mmap, 665 .mmap = cifs_file_mmap,
666 .sendfile = generic_file_sendfile, 666 .splice_read = generic_file_splice_read,
667 .llseek = cifs_llseek, 667 .llseek = cifs_llseek,
668#ifdef CONFIG_CIFS_POSIX 668#ifdef CONFIG_CIFS_POSIX
669 .ioctl = cifs_ioctl, 669 .ioctl = cifs_ioctl,
@@ -683,7 +683,7 @@ const struct file_operations cifs_file_direct_nobrl_ops = {
683 .release = cifs_close, 683 .release = cifs_close,
684 .fsync = cifs_fsync, 684 .fsync = cifs_fsync,
685 .flush = cifs_flush, 685 .flush = cifs_flush,
686 .sendfile = generic_file_sendfile, /* BB removeme BB */ 686 .splice_read = generic_file_splice_read,
687#ifdef CONFIG_CIFS_POSIX 687#ifdef CONFIG_CIFS_POSIX
688 .ioctl = cifs_ioctl, 688 .ioctl = cifs_ioctl,
689#endif /* CONFIG_CIFS_POSIX */ 689#endif /* CONFIG_CIFS_POSIX */
@@ -856,6 +856,7 @@ static int cifs_oplock_thread(void *dummyarg)
856 __u16 netfid; 856 __u16 netfid;
857 int rc; 857 int rc;
858 858
859 set_freezable();
859 do { 860 do {
860 if (try_to_freeze()) 861 if (try_to_freeze())
861 continue; 862 continue;