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/minix | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'fs/minix')
| -rw-r--r-- | fs/minix/inode.c | 3 | ||||
| -rw-r--r-- | fs/minix/namei.c | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index a581e328a..8eb26d478 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c @@ -1006,7 +1006,7 @@ struct buffer_head * minix_bread(struct inode * inode, int block, int create) return NULL; } -static int minix_writepage(struct dentry *dentry, struct page *page) +static int minix_writepage(struct file *file, struct dentry *dentry, struct page *page) { return block_write_full_page(page,minix_get_block); } @@ -1025,6 +1025,7 @@ static int minix_bmap(struct address_space *mapping, long block) struct address_space_operations minix_aops = { readpage: minix_readpage, writepage: minix_writepage, + sync_page: block_sync_page, prepare_write: minix_prepare_write, commit_write: generic_commit_write, bmap: minix_bmap diff --git a/fs/minix/namei.c b/fs/minix/namei.c index 211556d4a..7dc20ea7c 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c @@ -399,10 +399,6 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry) retval = -ENOENT; goto end_rmdir; } - if (!d_unhashed(dentry)) { - retval = -EBUSY; - goto end_rmdir; - } if (inode->i_nlink != 2) printk("empty directory has nlink!=2 (%d)\n",inode->i_nlink); de->inode = 0; @@ -569,9 +565,6 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry, } if (S_ISDIR(old_inode->i_mode)) { if (new_inode) { - retval = -EBUSY; - if (!d_unhashed(new_dentry)) - goto end_rename; retval = -ENOTEMPTY; if (!empty_dir(new_inode)) goto end_rename; |