diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 13:45:28 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 13:45:28 +0900 |
| commit | 77c7ee51a062bb595c501ec098125a68999c20c3 (patch) | |
| tree | c5060ca5786ef353e005dae04b61d2c49967284d /fs/stat.c | |
| parent | 1ba762209491e2496e58baffa3fd65d661f54404 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Conflicts:
drivers/tty/serial/sh-sci.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'fs/stat.c')
| -rw-r--r-- | fs/stat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/stat.c b/fs/stat.c index 961039121cb..ba5316ffac6 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -27,12 +27,12 @@ void generic_fillattr(struct inode *inode, struct kstat *stat) stat->uid = inode->i_uid; stat->gid = inode->i_gid; stat->rdev = inode->i_rdev; + stat->size = i_size_read(inode); stat->atime = inode->i_atime; stat->mtime = inode->i_mtime; stat->ctime = inode->i_ctime; - stat->size = i_size_read(inode); - stat->blocks = inode->i_blocks; stat->blksize = (1 << inode->i_blkbits); + stat->blocks = inode->i_blocks; } EXPORT_SYMBOL(generic_fillattr); |