diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /fs/minix | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'fs/minix')
| -rw-r--r-- | fs/minix/bitmap.c | 2 | ||||
| -rw-r--r-- | fs/minix/dir.c | 5 | ||||
| -rw-r--r-- | fs/minix/namei.c | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c index 9e27ee118..69b8e4e4c 100644 --- a/fs/minix/bitmap.c +++ b/fs/minix/bitmap.c @@ -255,12 +255,12 @@ struct inode * minix_new_inode(const struct inode * dir) inode->i_dev = sb->s_dev; inode->i_uid = current->fsuid; inode->i_gid = (dir->i_mode & S_ISGID) ? dir->i_gid : current->fsgid; - mark_inode_dirty(inode); inode->i_ino = j; inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; inode->i_op = NULL; inode->i_blocks = inode->i_blksize = 0; insert_inode_hash(inode); + mark_inode_dirty(inode); return inode; } diff --git a/fs/minix/dir.c b/fs/minix/dir.c index 31ac394a2..11ebef00f 100644 --- a/fs/minix/dir.c +++ b/fs/minix/dir.c @@ -20,7 +20,7 @@ static long minix_dir_read(struct inode * inode, struct file * filp, return -EISDIR; } -static int minix_readdir(struct inode *, struct file *, void *, filldir_t); +static int minix_readdir(struct file *, void *, filldir_t); static struct file_operations minix_dir_operations = { NULL, /* lseek - default */ @@ -58,13 +58,14 @@ struct inode_operations minix_dir_inode_operations = { NULL /* permission */ }; -static int minix_readdir(struct inode * inode, struct file * filp, +static int minix_readdir(struct file * filp, void * dirent, filldir_t filldir) { unsigned int offset; struct buffer_head * bh; struct minix_dir_entry * de; struct minix_sb_info * info; + struct inode *inode = filp->f_dentry->d_inode; if (!inode || !inode->i_sb || !S_ISDIR(inode->i_mode)) return -EBADF; diff --git a/fs/minix/namei.c b/fs/minix/namei.c index 19c7df247..dbd9e9ce4 100644 --- a/fs/minix/namei.c +++ b/fs/minix/namei.c @@ -754,8 +754,7 @@ start_up: } } /* Update the dcache */ - d_move(old_dentry, new_dentry->d_parent, &new_dentry->d_name); - d_delete(new_dentry); + d_move(old_dentry, new_dentry); retval = 0; end_rename: brelse(dir_bh); |