← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to fs/ubifs/journal.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/ubifs/journal.c
214
214
        err = ubifs_add_bud_to_log(c, jhead, lnum, offs);
215
215
        if (err)
216
216
                goto out_return;
217
 
        err = ubifs_wbuf_seek_nolock(wbuf, lnum, offs, wbuf->dtype);
 
217
        err = ubifs_wbuf_seek_nolock(wbuf, lnum, offs);
218
218
        if (err)
219
219
                goto out_unlock;
220
220
 
385
385
        if (err == -ENOSPC) {
386
386
                /* This are some budgeting problems, print useful information */
387
387
                down_write(&c->commit_sem);
388
 
                dbg_dump_stack();
389
 
                dbg_dump_budg(c, &c->bi);
390
 
                dbg_dump_lprops(c);
 
388
                dump_stack();
 
389
                ubifs_dump_budg(c, &c->bi);
 
390
                ubifs_dump_lprops(c);
391
391
                cmt_retries = dbg_check_lprops(c);
392
392
                up_write(&c->commit_sem);
393
393
        }
1267
1267
        return err;
1268
1268
}
1269
1269
 
1270
 
#ifdef CONFIG_UBIFS_FS_XATTR
1271
1270
 
1272
1271
/**
1273
1272
 * ubifs_jnl_delete_xattr - delete an extended attribute.
1462
1461
        return err;
1463
1462
}
1464
1463
 
1465
 
#endif /* CONFIG_UBIFS_FS_XATTR */