Commit 5515eff8 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] 2tb-files-add-blkcnt_t-fixes 



Cc: Takashi Sato <sho@tnes.nec.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a0f62ac6

fs/cifs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -163,9 +163,9 @@ int cifs_get_inode_info_unix(struct inode **pinode, 


		if (num_of_bytes < end_of_file)

			cFYI(1, ("allocation size less than end of file"));

		cFYI(1,

		     ("Size %ld and blocks %ld",

		      (unsigned long) inode->i_size, inode->i_blocks));

		cFYI(1, ("Size %ld and blocks %llu",

			(unsigned long) inode->i_size,

			(unsigned long long)inode->i_blocks));

		if (S_ISREG(inode->i_mode)) {

			cFYI(1, ("File inode"));

			inode->i_op = &cifs_file_inode_ops;

fs/cifs/readdir.c

+4 −4
Original line number Diff line number Diff line
@@ -197,9 +197,9 @@ static void fill_in_inode(struct inode *tmp_inode, 


	if (allocation_size < end_of_file)

		cFYI(1, ("May be sparse file, allocation less than file size"));

	cFYI(1,

	     ("File Size %ld and blocks %ld and blocksize %ld",

	      (unsigned long)tmp_inode->i_size, tmp_inode->i_blocks,

	cFYI(1, ("File Size %ld and blocks %llu and blocksize %ld",

		(unsigned long)tmp_inode->i_size,

		(unsigned long long)tmp_inode->i_blocks,

		tmp_inode->i_blksize));

	if (S_ISREG(tmp_inode->i_mode)) {

		cFYI(1, ("File inode"));

fs/ocfs2/journal.c

+5 −3
Original line number Diff line number Diff line
@@ -582,7 +582,8 @@ int ocfs2_journal_init(struct ocfs2_journal *journal, int *dirty) 
	}



	mlog(0, "inode->i_size = %lld\n", inode->i_size);

	mlog(0, "inode->i_blocks = %lu\n", inode->i_blocks);

	mlog(0, "inode->i_blocks = %llu\n",

			(unsigned long long)inode->i_blocks);

	mlog(0, "inode->ip_clusters = %u\n", OCFS2_I(inode)->ip_clusters);



	/* call the kernels journal init function now */
@@ -850,8 +851,9 @@ static int ocfs2_force_read_journal(struct inode *inode) 


	memset(bhs, 0, sizeof(struct buffer_head *) * CONCURRENT_JOURNAL_FILL);



	mlog(0, "Force reading %lu blocks\n",

	     (inode->i_blocks >> (inode->i_sb->s_blocksize_bits - 9)));

	mlog(0, "Force reading %llu blocks\n",

		(unsigned long long)(inode->i_blocks >>

			(inode->i_sb->s_blocksize_bits - 9)));



	v_blkno = 0;

	while (v_blkno <

fs/ocfs2/namei.c

+3 −2
Original line number Diff line number Diff line
@@ -1444,8 +1444,9 @@ static int ocfs2_create_symlink_data(struct ocfs2_super *osb, 
	 * write i_size + 1 bytes. */

	blocks = (bytes_left + sb->s_blocksize - 1) >> sb->s_blocksize_bits;



	mlog_entry("i_blocks = %lu, i_size = %llu, blocks = %d\n",

		       inode->i_blocks, i_size_read(inode), blocks);

	mlog_entry("i_blocks = %llu, i_size = %llu, blocks = %d\n",

			(unsigned long long)inode->i_blocks,

			i_size_read(inode), blocks);



	/* Sanity check -- make sure we're going to fit. */

	if (bytes_left >