diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /fs/hpfs | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'fs/hpfs')
| -rw-r--r-- | fs/hpfs/file.c | 2 | ||||
| -rw-r--r-- | fs/hpfs/hpfs_fn.h | 2 | ||||
| -rw-r--r-- | fs/hpfs/inode.c | 6 | ||||
| -rw-r--r-- | fs/hpfs/namei.c | 10 |
4 files changed, 6 insertions, 14 deletions
diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index ebe12eb40..c0707b52c 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c @@ -56,7 +56,7 @@ void hpfs_truncate(struct inode *i) i->i_blocks = 1 + ((i->i_size + 511) >> 9); i->u.hpfs_i.mmu_private = i->i_size; hpfs_truncate_btree(i->i_sb, i->i_ino, 1, ((i->i_size + 511) >> 9)); - hpfs_write_inode(i, 0); + hpfs_write_inode(i); } int hpfs_get_block(struct inode *inode, long iblock, struct buffer_head *bh_result, int create) diff --git a/fs/hpfs/hpfs_fn.h b/fs/hpfs/hpfs_fn.h index a76efa035..a01140f1f 100644 --- a/fs/hpfs/hpfs_fn.h +++ b/fs/hpfs/hpfs_fn.h @@ -266,7 +266,7 @@ ssize_t hpfs_file_write(struct file *file, const char *buf, size_t count, loff_t void hpfs_read_inode(struct inode *); void hpfs_write_inode_ea(struct inode *, struct fnode *); -void hpfs_write_inode(struct inode *, int); +void hpfs_write_inode(struct inode *); void hpfs_write_inode_nolock(struct inode *); int hpfs_notify_change(struct dentry *, struct iattr *); void hpfs_write_if_changed(struct inode *); diff --git a/fs/hpfs/inode.c b/fs/hpfs/inode.c index 2f3f3f32e..7938970c8 100644 --- a/fs/hpfs/inode.c +++ b/fs/hpfs/inode.c @@ -228,7 +228,7 @@ void hpfs_write_inode_ea(struct inode *i, struct fnode *fnode) } } -void hpfs_write_inode(struct inode *i, int unused) +void hpfs_write_inode(struct inode *i) { struct inode *parent; if (!i->i_nlink) return; @@ -300,14 +300,14 @@ int hpfs_notify_change(struct dentry *dentry, struct iattr *attr) if (inode->i_sb->s_hpfs_root == inode->i_ino) return -EINVAL; if ((error = inode_change_ok(inode, attr))) return error; inode_setattr(inode, attr); - hpfs_write_inode(inode, 0); + hpfs_write_inode(inode); return 0; } void hpfs_write_if_changed(struct inode *inode) { if (inode->i_hpfs_dirty) { - hpfs_write_inode(inode, 0); + hpfs_write_inode(inode); } } diff --git a/fs/hpfs/namei.c b/fs/hpfs/namei.c index 5684801df..b09ad98ea 100644 --- a/fs/hpfs/namei.c +++ b/fs/hpfs/namei.c @@ -330,15 +330,7 @@ int hpfs_unlink(struct inode *dir, struct dentry *dentry) struct iattr newattrs; int err; hpfs_unlock_2inodes(dir, inode); - if (rep) - goto ret; - d_drop(dentry); - if (dentry->d_count > 1 || - permission(inode, MAY_WRITE) || - get_write_access(inode)) { - d_rehash(dentry); - goto ret; - } + if (rep || dentry->d_count > 1 || permission(inode, MAY_WRITE) || get_write_access(inode)) goto ret; /*printk("HPFS: truncating file before delete.\n");*/ down(&inode->i_sem); newattrs.ia_size = 0; |