diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /fs/hpfs | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'fs/hpfs')
| -rw-r--r-- | fs/hpfs/file.c | 3 | ||||
| -rw-r--r-- | fs/hpfs/namei.c | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index d8063e296..8d9567273 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c @@ -86,7 +86,7 @@ int hpfs_get_block(struct inode *inode, long iblock, struct buffer_head *bh_resu return 0; } -static int hpfs_writepage(struct dentry *dentry, struct page *page) +static int hpfs_writepage(struct file *file, struct dentry *dentry, struct page *page) { return block_write_full_page(page,hpfs_get_block); } @@ -106,6 +106,7 @@ static int _hpfs_bmap(struct address_space *mapping, long block) struct address_space_operations hpfs_aops = { readpage: hpfs_readpage, writepage: hpfs_writepage, + sync_page: block_sync_page, prepare_write: hpfs_prepare_write, commit_write: generic_commit_write, bmap: _hpfs_bmap diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c index f02239eae..037c48be2 100644 --- a/fs/hpfs/namei.c +++ b/fs/hpfs/namei.c @@ -375,11 +375,6 @@ int hpfs_rmdir(struct inode *dir, struct dentry *dentry) hpfs_unlock_2inodes(dir, inode); return -ENOTDIR; } - if (!d_unhashed(dentry)) { - hpfs_brelse4(&qbh); - hpfs_unlock_2inodes(dir, inode); - return -EBUSY; - } hpfs_count_dnodes(dir->i_sb, inode->i_hpfs_dno, NULL, NULL, &n_items); if (n_items) { hpfs_brelse4(&qbh); |