Skip to content

Commit

Permalink
9p: Use the i_size_[read, write]() macros instead of using inode->i_s…
Browse files Browse the repository at this point in the history
…ize directly.

Change all occurrence of inode->i_size with i_size_read() or i_size_write()
as appropriate.

Signed-off-by: Abhishek Kulkarni <adkulkar@umail.iu.edu>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
  • Loading branch information
Abhishek Kulkarni authored and Eric Van Hensbergen committed Sep 23, 2009
1 parent 7043078 commit 7549ae3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions fs/9p/vfs_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions fs/9p/vfs_inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand Down

0 comments on commit 7549ae3

Please sign in to comment.