diff options
author | Andrew Morton <akpm@osdl.org> | 2006-03-26 04:37:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 11:57:00 -0500 |
commit | 5515eff811cb807f0d3221a6e8cc223c7850d205 (patch) | |
tree | 4538d128fd5b1d61d8d791a032c5a29e59b0d993 /fs/cifs | |
parent | a0f62ac6362c168754cccb36f196b3dfbddc3bc3 (diff) |
[PATCH] 2tb-files-add-blkcnt_t-fixes
Cc: Takashi Sato <sho@tnes.nec.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/cifs')
-rw-r--r-- | fs/cifs/inode.c | 6 | ||||
-rw-r--r-- | fs/cifs/readdir.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index ff93a9f81d1c..598eec9778f6 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -163,9 +163,9 @@ int cifs_get_inode_info_unix(struct inode **pinode, | |||
163 | 163 | ||
164 | if (num_of_bytes < end_of_file) | 164 | if (num_of_bytes < end_of_file) |
165 | cFYI(1, ("allocation size less than end of file")); | 165 | cFYI(1, ("allocation size less than end of file")); |
166 | cFYI(1, | 166 | cFYI(1, ("Size %ld and blocks %llu", |
167 | ("Size %ld and blocks %ld", | 167 | (unsigned long) inode->i_size, |
168 | (unsigned long) inode->i_size, inode->i_blocks)); | 168 | (unsigned long long)inode->i_blocks)); |
169 | if (S_ISREG(inode->i_mode)) { | 169 | if (S_ISREG(inode->i_mode)) { |
170 | cFYI(1, ("File inode")); | 170 | cFYI(1, ("File inode")); |
171 | inode->i_op = &cifs_file_inode_ops; | 171 | inode->i_op = &cifs_file_inode_ops; |
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index edb3b6eb34bc..488bd0d81dcf 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
@@ -197,10 +197,10 @@ static void fill_in_inode(struct inode *tmp_inode, | |||
197 | 197 | ||
198 | if (allocation_size < end_of_file) | 198 | if (allocation_size < end_of_file) |
199 | cFYI(1, ("May be sparse file, allocation less than file size")); | 199 | cFYI(1, ("May be sparse file, allocation less than file size")); |
200 | cFYI(1, | 200 | cFYI(1, ("File Size %ld and blocks %llu and blocksize %ld", |
201 | ("File Size %ld and blocks %ld and blocksize %ld", | 201 | (unsigned long)tmp_inode->i_size, |
202 | (unsigned long)tmp_inode->i_size, tmp_inode->i_blocks, | 202 | (unsigned long long)tmp_inode->i_blocks, |
203 | tmp_inode->i_blksize)); | 203 | tmp_inode->i_blksize)); |
204 | if (S_ISREG(tmp_inode->i_mode)) { | 204 | if (S_ISREG(tmp_inode->i_mode)) { |
205 | cFYI(1, ("File inode")); | 205 | cFYI(1, ("File inode")); |
206 | tmp_inode->i_op = &cifs_file_inode_ops; | 206 | tmp_inode->i_op = &cifs_file_inode_ops; |