git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
fs
/
sysv
/
inode.c
diff --git
a/fs/sysv/inode.c
b/fs/sysv/inode.c
index
3ff89cc
..
d63c5e4
100644
(file)
--- a/
fs/sysv/inode.c
+++ b/
fs/sysv/inode.c
@@
-85,8
+85,9
@@
static void sysv_put_super(struct super_block *sb)
kfree(sbi);
}
kfree(sbi);
}
-static int sysv_statfs(struct
super_block *sb
, struct kstatfs *buf)
+static int sysv_statfs(struct
dentry *dentry
, struct kstatfs *buf)
{
{
+ struct super_block *sb = dentry->d_sb;
struct sysv_sb_info *sbi = SYSV_SB(sb);
buf->f_type = sb->s_magic;
struct sysv_sb_info *sbi = SYSV_SB(sb);
buf->f_type = sb->s_magic;
@@
-200,7
+201,7
@@
static void sysv_read_inode(struct inode *inode)
inode->i_ctime.tv_nsec = 0;
inode->i_atime.tv_nsec = 0;
inode->i_mtime.tv_nsec = 0;
inode->i_ctime.tv_nsec = 0;
inode->i_atime.tv_nsec = 0;
inode->i_mtime.tv_nsec = 0;
- inode->i_blocks =
inode->i_blksize =
0;
+ inode->i_blocks = 0;
si = SYSV_I(inode);
for (block = 0; block < 10+1+1+1; block++)
si = SYSV_I(inode);
for (block = 0; block < 10+1+1+1; block++)