diff options
Diffstat (limited to 'fs/cifs')
-rw-r--r-- | fs/cifs/cifsfs.c | 1 | ||||
-rw-r--r-- | fs/cifs/readdir.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 4197a5043f13..22bcf4d7e7ae 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -253,7 +253,6 @@ cifs_alloc_inode(struct super_block *sb) | |||
253 | file data or metadata */ | 253 | file data or metadata */ |
254 | cifs_inode->clientCanCacheRead = FALSE; | 254 | cifs_inode->clientCanCacheRead = FALSE; |
255 | cifs_inode->clientCanCacheAll = FALSE; | 255 | cifs_inode->clientCanCacheAll = FALSE; |
256 | cifs_inode->vfs_inode.i_blksize = CIFS_MAX_MSGSIZE; | ||
257 | cifs_inode->vfs_inode.i_blkbits = 14; /* 2**14 = CIFS_MAX_MSGSIZE */ | 256 | cifs_inode->vfs_inode.i_blkbits = 14; /* 2**14 = CIFS_MAX_MSGSIZE */ |
258 | cifs_inode->vfs_inode.i_flags = S_NOATIME | S_NOCMTIME; | 257 | cifs_inode->vfs_inode.i_flags = S_NOATIME | S_NOCMTIME; |
259 | INIT_LIST_HEAD(&cifs_inode->openFileList); | 258 | INIT_LIST_HEAD(&cifs_inode->openFileList); |
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; |