diff options
Diffstat (limited to 'fs/bfs/dir.c')
-rw-r--r-- | fs/bfs/dir.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c index 4dd1b623f937..1e41aadb1068 100644 --- a/fs/bfs/dir.c +++ b/fs/bfs/dir.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <linux/time.h> | 8 | #include <linux/time.h> |
9 | #include <linux/string.h> | 9 | #include <linux/string.h> |
10 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
11 | #include <linux/smp_lock.h> | ||
12 | #include <linux/buffer_head.h> | 11 | #include <linux/buffer_head.h> |
13 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
14 | #include "bfs.h" | 13 | #include "bfs.h" |
@@ -79,7 +78,7 @@ static int bfs_readdir(struct file *f, void *dirent, filldir_t filldir) | |||
79 | const struct file_operations bfs_dir_operations = { | 78 | const struct file_operations bfs_dir_operations = { |
80 | .read = generic_read_dir, | 79 | .read = generic_read_dir, |
81 | .readdir = bfs_readdir, | 80 | .readdir = bfs_readdir, |
82 | .fsync = file_fsync, | 81 | .fsync = simple_fsync, |
83 | .llseek = generic_file_llseek, | 82 | .llseek = generic_file_llseek, |
84 | }; | 83 | }; |
85 | 84 | ||
@@ -205,7 +204,7 @@ static int bfs_unlink(struct inode *dir, struct dentry *dentry) | |||
205 | inode->i_nlink = 1; | 204 | inode->i_nlink = 1; |
206 | } | 205 | } |
207 | de->ino = 0; | 206 | de->ino = 0; |
208 | mark_buffer_dirty(bh); | 207 | mark_buffer_dirty_inode(bh, dir); |
209 | dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; | 208 | dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; |
210 | mark_inode_dirty(dir); | 209 | mark_inode_dirty(dir); |
211 | inode->i_ctime = dir->i_ctime; | 210 | inode->i_ctime = dir->i_ctime; |
@@ -267,7 +266,7 @@ static int bfs_rename(struct inode *old_dir, struct dentry *old_dentry, | |||
267 | new_inode->i_ctime = CURRENT_TIME_SEC; | 266 | new_inode->i_ctime = CURRENT_TIME_SEC; |
268 | inode_dec_link_count(new_inode); | 267 | inode_dec_link_count(new_inode); |
269 | } | 268 | } |
270 | mark_buffer_dirty(old_bh); | 269 | mark_buffer_dirty_inode(old_bh, old_dir); |
271 | error = 0; | 270 | error = 0; |
272 | 271 | ||
273 | end_rename: | 272 | end_rename: |
@@ -320,7 +319,7 @@ static int bfs_add_entry(struct inode *dir, const unsigned char *name, | |||
320 | for (i = 0; i < BFS_NAMELEN; i++) | 319 | for (i = 0; i < BFS_NAMELEN; i++) |
321 | de->name[i] = | 320 | de->name[i] = |
322 | (i < namelen) ? name[i] : 0; | 321 | (i < namelen) ? name[i] : 0; |
323 | mark_buffer_dirty(bh); | 322 | mark_buffer_dirty_inode(bh, dir); |
324 | brelse(bh); | 323 | brelse(bh); |
325 | return 0; | 324 | return 0; |
326 | } | 325 | } |