diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /fs/bfs | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'fs/bfs')
| -rw-r--r-- | fs/bfs/file.c | 2 | ||||
| -rw-r--r-- | fs/bfs/inode.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/bfs/file.c b/fs/bfs/file.c index f0ee10a15..de63fb2de 100644 --- a/fs/bfs/file.c +++ b/fs/bfs/file.c @@ -135,7 +135,7 @@ out: return err; } -static int bfs_writepage(struct file *file, struct page *page) +static int bfs_writepage(struct page *page) { return block_write_full_page(page, bfs_get_block); } diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c index b3827a7ae..8e33b4ab2 100644 --- a/fs/bfs/inode.c +++ b/fs/bfs/inode.c @@ -77,7 +77,6 @@ static void bfs_read_inode(struct inode * inode) inode->i_atime = di->i_atime; inode->i_mtime = di->i_mtime; inode->i_ctime = di->i_ctime; - inode->i_rdev = 0; /* BFS doesn't have special nodes */ inode->iu_dsk_ino = di->i_ino; /* can be 0 so we store a copy */ inode->iu_sblock = di->i_sblock; inode->iu_eblock = di->i_eblock; |