diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-08-22 00:02:57 -0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-08-22 00:02:57 -0400 |
| commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
| tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /fs/minix/inode.c | |
| parent | c7e25e6e0b0486492c5faaf6312b37413642c48e (diff) | |
| parent | 93862d5e1ab875664c6cc95254fc365028a48bb1 (diff) | |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
Diffstat (limited to 'fs/minix/inode.c')
| -rw-r--r-- | fs/minix/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index adcdc0a4e182..e7d23e25bf1d 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c | |||
| @@ -596,8 +596,7 @@ static int minix_write_inode(struct inode *inode, struct writeback_control *wbc) | |||
| 596 | 596 | ||
| 597 | int minix_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) | 597 | int minix_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) |
| 598 | { | 598 | { |
| 599 | struct inode *dir = dentry->d_parent->d_inode; | 599 | struct super_block *sb = dentry->d_sb; |
| 600 | struct super_block *sb = dir->i_sb; | ||
| 601 | generic_fillattr(dentry->d_inode, stat); | 600 | generic_fillattr(dentry->d_inode, stat); |
| 602 | if (INODE_VERSION(dentry->d_inode) == MINIX_V1) | 601 | if (INODE_VERSION(dentry->d_inode) == MINIX_V1) |
| 603 | stat->blocks = (BLOCK_SIZE / 512) * V1_minix_blocks(stat->size, sb); | 602 | stat->blocks = (BLOCK_SIZE / 512) * V1_minix_blocks(stat->size, sb); |