← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-ports/karmic

« back to all changes in this revision

Viewing changes to fs/ext3/xattr.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Luke Yelavich, Michael Casadevall, Tim Gardner, Upstream Kernel Changes
  • Date: 2009-05-06 18:18:55 UTC
  • Revision ID: james.westby@ubuntu.com-20090506181855-t00baeevpnvd9o7a
Tags: 2.6.30-1.1
[ Luke Yelavich ]
* initial release for karmic
* SAUCE: rebase-ports - adjust for the karmic ports kernel
* SAUCE: rebase-ports - also remove abi dirs/files on rebase
* Update configs after rebase against mainline Jaunty tree
* [Config] Disable CONFIG_BLK_DEV_UB and CONFIG_USB_LIBUSUAL as per
  mainline jaunty
* forward-port patch to drbd for powerpc compilation
* [Config] disable CONFIG_LENOVO_SL_LAPTOP for i386 due to FTBFS
* add .o files found in arch/powerpc/lib to all powerpc kernel header
  packages
* [Config] enable CONFIG_DRM_I915_KMS for i386 as per karmic mainline

[ Michael Casadevall ]

* Disable kgdb on sparc64
* [sparc] [Config] Disable GPIO LEDS
* [ia64] Rename -ia64-generic to -ia64 in line with other architectures
* Correct kernel image path for sparc builds
* [hppa] Fix HPPA config files to build modules for all udebian

Rebase on top of karmic mainline 2.6.30-1.1

[ Tim Gardner ]

* [Config] armel: disable staging drivers, fixes FTBS
* [Config] armel imx51: Disable CONFIG_MTD_NAND_MXC, fixes FTBS

[ Upstream Kernel Changes ]

* mpt2sas: Change reset_type enum to avoid namespace collision.
  Submitted upstream.

* Initial release after rebasing against v2.6.30-rc3

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/ext3/xattr.c
498
498
                error = ext3_journal_dirty_metadata(handle, bh);
499
499
                if (IS_SYNC(inode))
500
500
                        handle->h_sync = 1;
501
 
                DQUOT_FREE_BLOCK(inode, 1);
 
501
                vfs_dq_free_block(inode, 1);
502
502
                ea_bdebug(bh, "refcount now=%d; releasing",
503
503
                          le32_to_cpu(BHDR(bh)->h_refcount));
504
504
                if (ce)
774
774
                                /* The old block is released after updating
775
775
                                   the inode. */
776
776
                                error = -EDQUOT;
777
 
                                if (DQUOT_ALLOC_BLOCK(inode, 1))
 
777
                                if (vfs_dq_alloc_block(inode, 1))
778
778
                                        goto cleanup;
779
779
                                error = ext3_journal_get_write_access(handle,
780
780
                                                                      new_bh);
848
848
        return error;
849
849
 
850
850
cleanup_dquot:
851
 
        DQUOT_FREE_BLOCK(inode, 1);
 
851
        vfs_dq_free_block(inode, 1);
852
852
        goto cleanup;
853
853
 
854
854
bad_block: