9p: Use the i_size_[read, write]() macros instead of using inode->i_size directly.

Abhishek Kulkarni · Eric Van Hensbergen · commit 7549ae3e81cc · 2009-09-23T13:03:46.000-05:00
Change all occurrence of inode-&gt;i_size with i_size_read() or i_size_write()
as appropriate.

Signed-off-by: Abhishek Kulkarni &lt;adkulkar@umail.iu.edu&gt;
Signed-off-by: Eric Van Hensbergen &lt;ericvh@gmail.com&gt;
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
@@ -72,7 +72,7 @@ int v9fs_file_open(struct inode *inode, struct file *file)
 			return err;
 		}
 		if (omode & P9_OTRUNC) {
-			inode->i_size = 0;
+			i_size_write(inode, 0);
 			inode->i_blocks = 0;
 		}
 		if ((file->f_flags & O_APPEND) && (!v9fs_extended(v9ses)))
@@ -239,9 +239,9 @@ v9fs_file_write(struct file *filp, const char __user * data,
 		*offset += total;
 	}
 
-	if (*offset > inode->i_size) {
-		inode->i_size = *offset;
-		inode->i_blocks = (inode->i_size + 512 - 1) >> 9;
+	if (*offset > i_size_read(inode)) {
+		i_size_write(inode, *offset);
+		inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9;
 	}
 
 	if (n < 0)
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
@@ -872,10 +872,10 @@ v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode,
 	} else
 		inode->i_rdev = 0;
 
-	inode->i_size = stat->length;
+	i_size_write(inode, stat->length);
 
 	/* not real number of blocks, but 512 byte ones ... */
-	inode->i_blocks = (inode->i_size + 512 - 1) >> 9;
+	inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ int v9fs_file_open(struct inode inode, struct file file)`
`72`	`72`	`return err;`
`73`	`73`	`}`
`74`	`74`	`if (omode & P9_OTRUNC) {`
`75`		`- inode->i_size = 0;`
	`75`	`+ i_size_write(inode, 0);`
`76`	`76`	`inode->i_blocks = 0;`
`77`	`77`	`}`
`78`	`78`	`if ((file->f_flags & O_APPEND) && (!v9fs_extended(v9ses)))`
`@@ -239,9 +239,9 @@ v9fs_file_write(struct file filp, const char __user data,`
`239`	`239`	`*offset += total;`
`240`	`240`	`}`
`241`	`241`
`242`		`- if (*offset > inode->i_size) {`
`243`		`- inode->i_size = *offset;`
`244`		`- inode->i_blocks = (inode->i_size + 512 - 1) >> 9;`
	`242`	`+ if (*offset > i_size_read(inode)) {`
	`243`	`+ i_size_write(inode, *offset);`
	`244`	`+ inode->i_blocks = (i_size_read(inode) + 512 - 1) >> 9;`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`if (n < 0)`