mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment Kconfig help: MTD_JEDECPROBE already supports Intel Remove ugly debugging stuff do_mounts.c: Minor ROOT_DEV comment cleanup BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c BUG_ON() Conversion in mm/mempool.c BUG_ON() Conversion in mm/memory.c BUG_ON() Conversion in kernel/fork.c BUG_ON() Conversion in ipc/sem.c BUG_ON() Conversion in fs/ext2/ BUG_ON() Conversion in fs/hfs/ BUG_ON() Conversion in fs/dcache.c BUG_ON() Conversion in fs/buffer.c BUG_ON() Conversion in input/serio/hp_sdc_mlc.c BUG_ON() Conversion in md/dm-table.c BUG_ON() Conversion in md/dm-path-selector.c BUG_ON() Conversion in drivers/isdn BUG_ON() Conversion in drivers/char BUG_ON() Conversion in drivers/mtd/
This commit is contained in:
commit
9ae21d1bb3
26 changed files with 50 additions and 98 deletions
|
|
@ -416,8 +416,7 @@ void ext2_set_link(struct inode *dir, struct ext2_dir_entry_2 *de,
|
|||
|
||||
lock_page(page);
|
||||
err = page->mapping->a_ops->prepare_write(NULL, page, from, to);
|
||||
if (err)
|
||||
BUG();
|
||||
BUG_ON(err);
|
||||
de->inode = cpu_to_le32(inode->i_ino);
|
||||
ext2_set_de_type (de, inode);
|
||||
err = ext2_commit_chunk(page, from, to);
|
||||
|
|
@ -554,8 +553,7 @@ int ext2_delete_entry (struct ext2_dir_entry_2 * dir, struct page * page )
|
|||
from = (char*)pde - (char*)page_address(page);
|
||||
lock_page(page);
|
||||
err = mapping->a_ops->prepare_write(NULL, page, from, to);
|
||||
if (err)
|
||||
BUG();
|
||||
BUG_ON(err);
|
||||
if (pde)
|
||||
pde->rec_len = cpu_to_le16(to-from);
|
||||
dir->inode = 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue