Subject: [folded-merged] hfsplus-fix-concurrent-acess-of-alloc_blocks-fix-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,hch@xxxxxx,khoroshilov@xxxxxxxxx,slava@xxxxxxxxxxx,sougata@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 03 Apr 2014 14:13:57 -0700 The patch titled Subject: hfsplus-fix-concurrent-acess-of-alloc_blocks-fix-fix has been removed from the -mm tree. Its filename was hfsplus-fix-concurrent-acess-of-alloc_blocks-fix-fix.patch This patch was dropped because it was folded into hfsplus-fix-concurrent-acess-of-alloc_blocks.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: hfsplus-fix-concurrent-acess-of-alloc_blocks-fix-fix remove now-unused label `out' Cc: Alexey Khoroshilov <khoroshilov@xxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Cc: Sougata Santra <sougata@xxxxxxxxxx> Cc: Vyacheslav Dubeyko <slava@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/hfsplus/extents.c | 1 - 1 file changed, 1 deletion(-) diff -puN fs/hfsplus/extents.c~hfsplus-fix-concurrent-acess-of-alloc_blocks-fix-fix fs/hfsplus/extents.c --- a/fs/hfsplus/extents.c~hfsplus-fix-concurrent-acess-of-alloc_blocks-fix-fix +++ a/fs/hfsplus/extents.c @@ -598,7 +598,6 @@ void hfsplus_file_truncate(struct inode hip->alloc_blocks = blk_cnt; out_unlock: mutex_unlock(&hip->extents_lock); -out: hip->phys_size = inode->i_size; hip->fs_blocks = (inode->i_size + sb->s_blocksize - 1) >> sb->s_blocksize_bits; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch fanotify-use-fanotify-event-structure-for-permission-response-processing.patch ocfs2-add-dlm_recover_callback_support-in-sysfs.patch ocfs2-flock-drop-cross-node-lock-when-failed-locally.patch ocfs2-rollback-alloc_dinode-counts-when-ocfs2_block_group_set_bits-failed.patch mm-hugetlb-improve-page-fault-scalability.patch mm-vmstat-fix-up-zone-state-accounting.patch mm-keep-page-cache-radix-tree-nodes-in-check.patch mm-process_vm_accessc-mark-function-as-static.patch drop_caches-add-some-documentation-and-info-message.patch sys_sysfs-add-config_sysfs_syscall.patch kernel-groupsc-remove-return-value-of-set_groups.patch xattr-guard-against-simultaneous-glibc-header-inclusion-v2.patch lib-syscallc-unexport-task_current_syscall.patch scripts-checkpatchpl-__gfp_nofail-isnt-going-away.patch rtc-fixed-potential-race-condition.patch befs-logging-clean-up.patch hfsplus-fix-concurrent-acess-of-alloc_blocks.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html