aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext2/dir.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext2/dir.c')
-rw-r--r--fs/ext2/dir.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c
index b3dbd716cd3a..d672aa9f4061 100644
--- a/fs/ext2/dir.c
+++ b/fs/ext2/dir.c
@@ -416,8 +416,7 @@ void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,
416 416
417 lock_page(page); 417 lock_page(page);
418 err = page->mapping->a_ops->prepare_write(NULL, page, from, to); 418 err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
419 if (err) 419 BUG_ON(err);
420 BUG();
421 de->inode = cpu_to_le32(inode->i_ino); 420 de->inode = cpu_to_le32(inode->i_ino);
422 ext2_set_de_type (de, inode); 421 ext2_set_de_type (de, inode);
423 err = ext2_commit_chunk(page, from, to); 422 err = ext2_commit_chunk(page, from, to);
@@ -554,8 +553,7 @@ int ext2_delete_entry (struct ext2_dir_entry_2 * dir, struct page * page )
554 from = (char*)pde - (char*)page_address(page); 553 from = (char*)pde - (char*)page_address(page);
555 lock_page(page); 554 lock_page(page);
556 err = mapping->a_ops->prepare_write(NULL, page, from, to); 555 err = mapping->a_ops->prepare_write(NULL, page, from, to);
557 if (err) 556 BUG_ON(err);
558 BUG();
559 if (pde) 557 if (pde)
560 pde->rec_len = cpu_to_le16(to-from); 558 pde->rec_len = cpu_to_le16(to-from);
561 dir->inode = 0; 559 dir->inode = 0;
@@ -660,7 +658,7 @@ not_empty:
660 return 0; 658 return 0;
661} 659}
662 660
663struct file_operations ext2_dir_operations = { 661const struct file_operations ext2_dir_operations = {
664 .llseek = generic_file_llseek, 662 .llseek = generic_file_llseek,
665 .read = generic_read_dir, 663 .read = generic_read_dir,
666 .readdir = ext2_readdir, 664 .readdir = ext2_readdir,