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/qnx4 | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'fs/qnx4')
| -rw-r--r-- | fs/qnx4/inode.c | 3 | ||||
| -rw-r--r-- | fs/qnx4/namei.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index c6511354b..e54d32914 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c @@ -410,7 +410,7 @@ static void qnx4_put_super(struct super_block *sb) return; } -static int qnx4_writepage(struct dentry *dentry, struct page *page) +static int qnx4_writepage(struct file *file, struct dentry *dentry, struct page *page) { return block_write_full_page(page,qnx4_get_block); } @@ -430,6 +430,7 @@ static int qnx4_bmap(struct address_space *mapping, long block) struct address_space_operations qnx4_aops = { readpage: qnx4_readpage, writepage: qnx4_writepage, + sync_page: block_sync_page, prepare_write: qnx4_prepare_write, commit_write: generic_commit_write, bmap: qnx4_bmap diff --git a/fs/qnx4/namei.c b/fs/qnx4/namei.c index a25200b14..5be9b240f 100644 --- a/fs/qnx4/namei.c +++ b/fs/qnx4/namei.c @@ -171,10 +171,6 @@ int qnx4_rmdir(struct inode *dir, struct dentry *dentry) goto end_rmdir; } #endif - if (!d_unhashed(dentry)) { - retval = -EBUSY; - goto end_rmdir; - } if (inode->i_nlink != 2) { QNX4DEBUG(("empty directory has nlink!=2 (%d)\n", inode->i_nlink)); } |