diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /fs/hppfs/hppfs_kern.c | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/hppfs/hppfs_kern.c')
| -rw-r--r-- | fs/hppfs/hppfs_kern.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c index 3a9bdf58166f..dcb6d2e988b8 100644 --- a/fs/hppfs/hppfs_kern.c +++ b/fs/hppfs/hppfs_kern.c | |||
| @@ -152,7 +152,6 @@ static void hppfs_read_inode(struct inode *ino) | |||
| 152 | ino->i_mode = proc_ino->i_mode; | 152 | ino->i_mode = proc_ino->i_mode; |
| 153 | ino->i_nlink = proc_ino->i_nlink; | 153 | ino->i_nlink = proc_ino->i_nlink; |
| 154 | ino->i_size = proc_ino->i_size; | 154 | ino->i_size = proc_ino->i_size; |
| 155 | ino->i_blksize = proc_ino->i_blksize; | ||
| 156 | ino->i_blocks = proc_ino->i_blocks; | 155 | ino->i_blocks = proc_ino->i_blocks; |
| 157 | } | 156 | } |
| 158 | 157 | ||