diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /fs/cifs/readdir.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/cifs/readdir.c')
| -rw-r--r-- | fs/cifs/readdir.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index 9aeb58a7d369..b27b34537bf2 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c | |||
| @@ -216,10 +216,9 @@ static void fill_in_inode(struct inode *tmp_inode, int new_buf_type, | |||
| 216 | 216 | ||
| 217 | if (allocation_size < end_of_file) | 217 | if (allocation_size < end_of_file) |
| 218 | cFYI(1, ("May be sparse file, allocation less than file size")); | 218 | cFYI(1, ("May be sparse file, allocation less than file size")); |
| 219 | cFYI(1, ("File Size %ld and blocks %llu and blocksize %ld", | 219 | cFYI(1, ("File Size %ld and blocks %llu", |
| 220 | (unsigned long)tmp_inode->i_size, | 220 | (unsigned long)tmp_inode->i_size, |
| 221 | (unsigned long long)tmp_inode->i_blocks, | 221 | (unsigned long long)tmp_inode->i_blocks)); |
| 222 | tmp_inode->i_blksize)); | ||
| 223 | if (S_ISREG(tmp_inode->i_mode)) { | 222 | if (S_ISREG(tmp_inode->i_mode)) { |
| 224 | cFYI(1, ("File inode")); | 223 | cFYI(1, ("File inode")); |
| 225 | tmp_inode->i_op = &cifs_file_inode_ops; | 224 | tmp_inode->i_op = &cifs_file_inode_ops; |