diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
tree | 5e32586114534ed3f2165614cba3d578f5d87307 /fs/fuse/inode.c | |
parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/fuse/inode.c')
-rw-r--r-- | fs/fuse/inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 7d25092262ae..cb7cadb0b790 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c | |||
@@ -118,7 +118,6 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr) | |||
118 | inode->i_uid = attr->uid; | 118 | inode->i_uid = attr->uid; |
119 | inode->i_gid = attr->gid; | 119 | inode->i_gid = attr->gid; |
120 | i_size_write(inode, attr->size); | 120 | i_size_write(inode, attr->size); |
121 | inode->i_blksize = PAGE_CACHE_SIZE; | ||
122 | inode->i_blocks = attr->blocks; | 121 | inode->i_blocks = attr->blocks; |
123 | inode->i_atime.tv_sec = attr->atime; | 122 | inode->i_atime.tv_sec = attr->atime; |
124 | inode->i_atime.tv_nsec = attr->atimensec; | 123 | inode->i_atime.tv_nsec = attr->atimensec; |