diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 09:08:57 -0400 |
| commit | 76467874b83835129dc454e3a7a8e5d1186101b0 (patch) | |
| tree | 162129f0c36c35be4aa323cf00626db0e804c3fc /fs/sysv/dir.c | |
| parent | 8628de0583504138551a05ad44ca388467f0f552 (diff) | |
| parent | 6246b6128bbe34d0752f119cf7c5111c85fe481d (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/sysv/dir.c')
| -rw-r--r-- | fs/sysv/dir.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/sysv/dir.c b/fs/sysv/dir.c index 8c66e9270dd6..d7074341ee87 100644 --- a/fs/sysv/dir.c +++ b/fs/sysv/dir.c | |||
| @@ -253,8 +253,7 @@ int sysv_delete_entry(struct sysv_dir_entry *de, struct page *page) | |||
| 253 | 253 | ||
| 254 | lock_page(page); | 254 | lock_page(page); |
| 255 | err = mapping->a_ops->prepare_write(NULL, page, from, to); | 255 | err = mapping->a_ops->prepare_write(NULL, page, from, to); |
| 256 | if (err) | 256 | BUG_ON(err); |
| 257 | BUG(); | ||
| 258 | de->inode = 0; | 257 | de->inode = 0; |
| 259 | err = dir_commit_chunk(page, from, to); | 258 | err = dir_commit_chunk(page, from, to); |
| 260 | dir_put_page(page); | 259 | dir_put_page(page); |
| @@ -353,8 +352,7 @@ void sysv_set_link(struct sysv_dir_entry *de, struct page *page, | |||
| 353 | 352 | ||
| 354 | lock_page(page); | 353 | lock_page(page); |
| 355 | err = page->mapping->a_ops->prepare_write(NULL, page, from, to); | 354 | err = page->mapping->a_ops->prepare_write(NULL, page, from, to); |
| 356 | if (err) | 355 | BUG_ON(err); |
| 357 | BUG(); | ||
| 358 | de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino); | 356 | de->inode = cpu_to_fs16(SYSV_SB(inode->i_sb), inode->i_ino); |
| 359 | err = dir_commit_chunk(page, from, to); | 357 | err = dir_commit_chunk(page, from, to); |
| 360 | dir_put_page(page); | 358 | dir_put_page(page); |