diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-12 20:32:36 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-12 20:32:36 +0000 |
| commit | 90c81e0b0eda214196cbe4340facbce8cc797ee7 (patch) | |
| tree | a516944067e6437a88705a3d96157d07de3dae51 /fs/cifs/file.c | |
| parent | ad7a2926b9e53cfb3020d15bdfacacc54e2b63da (diff) | |
| download | op-kernel-dev-90c81e0b0eda214196cbe4340facbce8cc797ee7.zip op-kernel-dev-90c81e0b0eda214196cbe4340facbce8cc797ee7.tar.gz | |
[CIFS] clean up some hard to read ifdefs
Christoph had noticed too many ifdefs in the CIFS code making it
hard to read. This patch removes about a quarter of them from
the C files in cifs by improving a few key ifdefs in the .h files.
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 983557d..fa849c9 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -499,9 +499,8 @@ int cifs_close(struct inode *inode, struct file *file) the struct would be in each open file, but this should give enough time to clear the socket */ -#ifdef CONFIG_CIFS_DEBUG2 - cFYI(1, ("close delay, write pending")); -#endif /* DEBUG2 */ + cFYI(DBG2, + ("close delay, write pending")); msleep(timeout); timeout *= 4; } @@ -1812,9 +1811,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, pTcon = cifs_sb->tcon; pagevec_init(&lru_pvec, 0); -#ifdef CONFIG_CIFS_DEBUG2 - cFYI(1, ("rpages: num pages %d", num_pages)); -#endif + cFYI(DBG2, ("rpages: num pages %d", num_pages)); for (i = 0; i < num_pages; ) { unsigned contig_pages; struct page *tmp_page; @@ -1847,10 +1844,8 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, /* Read size needs to be in multiples of one page */ read_size = min_t(const unsigned int, read_size, cifs_sb->rsize & PAGE_CACHE_MASK); -#ifdef CONFIG_CIFS_DEBUG2 - cFYI(1, ("rpages: read size 0x%x contiguous pages %d", + cFYI(DBG2, ("rpages: read size 0x%x contiguous pages %d", read_size, contig_pages)); -#endif rc = -EAGAIN; while (rc == -EAGAIN) { if ((open_file->invalidHandle) && |
