diff options
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r-- | fs/cifs/file.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 983557d12b0e..fa849c91d323 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -499,9 +499,8 @@ int cifs_close(struct inode *inode, struct file *file) | |||
499 | the struct would be in each open file, | 499 | the struct would be in each open file, |
500 | but this should give enough time to | 500 | but this should give enough time to |
501 | clear the socket */ | 501 | clear the socket */ |
502 | #ifdef CONFIG_CIFS_DEBUG2 | 502 | cFYI(DBG2, |
503 | cFYI(1, ("close delay, write pending")); | 503 | ("close delay, write pending")); |
504 | #endif /* DEBUG2 */ | ||
505 | msleep(timeout); | 504 | msleep(timeout); |
506 | timeout *= 4; | 505 | timeout *= 4; |
507 | } | 506 | } |
@@ -1812,9 +1811,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, | |||
1812 | pTcon = cifs_sb->tcon; | 1811 | pTcon = cifs_sb->tcon; |
1813 | 1812 | ||
1814 | pagevec_init(&lru_pvec, 0); | 1813 | pagevec_init(&lru_pvec, 0); |
1815 | #ifdef CONFIG_CIFS_DEBUG2 | 1814 | cFYI(DBG2, ("rpages: num pages %d", num_pages)); |
1816 | cFYI(1, ("rpages: num pages %d", num_pages)); | ||
1817 | #endif | ||
1818 | for (i = 0; i < num_pages; ) { | 1815 | for (i = 0; i < num_pages; ) { |
1819 | unsigned contig_pages; | 1816 | unsigned contig_pages; |
1820 | struct page *tmp_page; | 1817 | struct page *tmp_page; |
@@ -1847,10 +1844,8 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, | |||
1847 | /* Read size needs to be in multiples of one page */ | 1844 | /* Read size needs to be in multiples of one page */ |
1848 | read_size = min_t(const unsigned int, read_size, | 1845 | read_size = min_t(const unsigned int, read_size, |
1849 | cifs_sb->rsize & PAGE_CACHE_MASK); | 1846 | cifs_sb->rsize & PAGE_CACHE_MASK); |
1850 | #ifdef CONFIG_CIFS_DEBUG2 | 1847 | cFYI(DBG2, ("rpages: read size 0x%x contiguous pages %d", |
1851 | cFYI(1, ("rpages: read size 0x%x contiguous pages %d", | ||
1852 | read_size, contig_pages)); | 1848 | read_size, contig_pages)); |
1853 | #endif | ||
1854 | rc = -EAGAIN; | 1849 | rc = -EAGAIN; |
1855 | while (rc == -EAGAIN) { | 1850 | while (rc == -EAGAIN) { |
1856 | if ((open_file->invalidHandle) && | 1851 | if ((open_file->invalidHandle) && |