2008-02-03 20:18:35

by Andrew Morton

[permalink] [raw]
Subject: - disable-ext4.patch removed from -mm tree


The patch titled
disable-ext4
has been removed from the -mm tree. Its filename was
disable-ext4.patch

This patch was dropped because it is obsolete

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: disable-ext4
From: Andrew Morton <[email protected]>

The defrag patches use iget(), which will not be present in 2.6.25

Cc: Theodore Ts'o <[email protected]>
Cc: David Howells <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

fs/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff -puN fs/Kconfig~disable-ext4 fs/Kconfig
--- a/fs/Kconfig~disable-ext4
+++ a/fs/Kconfig
@@ -139,6 +139,7 @@ config EXT3_FS_SECURITY
config EXT4DEV_FS
tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)"
depends on EXPERIMENTAL
+ depends on BROKEN
select JBD2
select CRC16
help
_

Patches currently in -mm which might be from [email protected] are

origin.patch
kvm-i386-fix.patch
drivers-net-wireless-b43-mainc-needs-ioh.patch
get_task_comm-return-the-result.patch
clone-prepare-to-recycle-clone_detached-and-clone_stopped.patch
clone-prepare-to-recycle-clone_detached-and-clone_stopped-fix.patch
timerfd-v3-new-timerfd-api-make-the-returned-time-to-be-the-remaining-time-till-the-next-expiration-checkpatch-fixes.patch
timerfd-v3-new-timerfd-api-ia64-fix.patch
timerfd-v3-new-timerfd-api-m68k-fix.patch
timerfd-v3-new-timerfd-api-mips-fix.patch
timerfd-v3-new-timerfd-api-arch-fixes.patch
timerfd-v3-new-timerfd-api-powerpc-fix.patch
timerfd-v3-new-timerfd-api-sparc64-fix.patch
drivers-usb-serial-io_tic-remove-pointless-eye-candy-in-debug-statements.patch
drivers-usb-serial-io_tic-remove-pointless-eye-candy-in-debug-statements-checkpatch-fixes.patch
git-acpi.patch
acpi-enable-c3-power-state-on-dell-inspiron-8200.patch
small-acpica-extension-to-be-able-to-store-the-name-of.patch
acpi-backlight-reset-brightness-on-resume-checkpatch-fixes.patch
git-alsa-disable-sound-pci-ice1712-ice1724c.patch
git-agpgart.patch
git-agpgart-fix.patch
git-audit-master.patch
git-audit-printk-warning-fix.patch
cifs-fix-warning.patch
git-cpufreq.patch
revert-agk-dm-dm-loop.patch
include-asm-powerpc-nvramh-needs-listh.patch
include-asm-powerpc-nvramh-needs-listh-fix.patch
drivers-pcmcia-i82092c-fix-up-after-pci_bus_region-changes.patch
git-drm.patch
git-drm-fix.patch
drm-convert-from-nopage-to-fault-checkpatch-fixes.patch
drivers-media-video-em28xx-em28xx-corec-fix-use-of-potentially-uninitialized-variable.patch
adt7473-new-driver-for-analog-devices-adt7473-sensor-chip-fix.patch
revert-git-hrt.patch
infiniband-is-scrogged-again.patch
i8042-non-x86-build-fix.patch
drivers-input-touchscreen-ads7846c-fix-uninitialized-var-warning.patch
git-kbuild.patch
git-kvm.patch
ata-drivers-ata-sata_mvc-needs-dmapoolh.patch
drivers-ide-ide-acpic-fix-uninitialized-var-warning.patch
drivers-ide-legacy-hdc-fix-uninitialized-var-warning.patch
git-md-accel.patch
memstick-initial-commit-for-sony-memorystick-support-fix-2.patch
memstick-git-busted.patch
git-mmc.patch
git-mtd.patch
git-netdev-all-fix-conflicts-fix.patch
drivers-net-dm9000c-vague-probably-wrong-build-fix.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
git-backlight.patch
bluetooth-uninlining.patch
serial-add-addi-data-gmbh-communication-cardsin8250_pcic-and-pci_idsh-checkpatch-fixes.patch
fix-gregkh-pci-pci-pcie-aspm-support.patch
cleanup-gregkh-pci-pci-fix-bus-resource-assignment-on-32-bits-with-64b-resources.patch
quirks-set-en-bit-of-msi-mapping-for-devices-onht-based-nvidia-platform-checkpatch-fixes.patch
x86-validate-against-acpi-motherboard-resources.patch
git-sched.patch
git-scsi-misc.patch
scsi-fix-isa-pcmcia-compile-problem-checkpatch-fixes.patch
scsi-aic94xx-cleanups-checkpatch-fixes.patch
scsi-aic94xx-cleanups-checkpatch-fixes-checkpatch-fixes.patch
drivers-scsi-dc395xc-fix-uninitialized-var-warning.patch
libsas-convert-ata-bridge-to-use-new-eh.patch
git-unionfs.patch
vfs-swap-do_ioctl-and-vfs_ioctl-names-fix.patch
ehci-hcd-fix-sparse-warning-about-shadowing-status-symbol-checkpatch-fixes.patch
drivers-usb-storage-sddr55c-fix-uninitialized-var-warnings.patch
usb-ohci-sm501-driver-v2-fix.patch
9p-fix-p9_printfcall-export.patch
git-watchdog.patch
git-watchdog-fixup.patch
b43-fix-build-with-config_ssb_pcihost=n.patch
git-ipwireless_cs.patch
git-x86.patch
git-x86-fix-rejects.patch
git-x86-vs-pm-acquire-device-locks-on-suspend-rev-3.patch
pci-dont-load-acpi_php-when-acpi-is-disabled.patch
pci-dont-load-acpi_php-when-acpi-is-disabled-fix.patch
x86-amd-thermal-interrupt-support-fix-2.patch
x86-mmconf-enable-mcfg-early-cleanup.patch
git-xtensa.patch
pagecache-zeroing-zero_user_segment-zero_user_segments-and-zero_user-fix.patch
pagecache-zeroing-zero_user_segment-zero_user_segments-and-zero_user-fix-2.patch
vmalloc-add-const-to-void-parameters-fix.patch
i386-resolve-dependency-of-asm-i386-pgtableh-on-highmemh-checkpatch-fixes.patch
slub-fix-coding-style-violations-checkpatch-fixes.patch
slub-provide-unique-end-marker-for-each-slab-fix.patch
slub-do-our-own-locking-via-slab_lock-and-slab_unlock-checkpatch-fixes.patch
bufferhead-revert-constructor-removal-checkpatch-fixes.patch
shmem-factor-out-sbi-free_inodes-manipulations-fix.patch
maps4-rework-task_size-macros-mips-fix.patch
maps4-add-proc-kpagecount-interface-fix.patch
maps4-add-proc-kpageflags-interface-fix.patch
maps4-add-proc-kpageflags-interface-fix-2-fix.patch
maps4-make-page-monitoring-proc-file-optional-fix.patch
page-allocator-clean-up-pcp-draining-functions-swsusp-fix-fix.patch
add-mm-argument-to-pte-pmd-pud-pgd_free-checkpatch-fixes.patch
mm-page-writeback-highmem_is_dirtyable-option-fix.patch
mm-remove-fastcall-from-mm-checkpatch-fixes.patch
page-migraton-handle-orphaned-pages-fix.patch
vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch
vm-dont-run-touch_buffer-during-buffercache-lookups.patch
revert-capabilities-clean-up-file-capability-reading.patch
revert-capabilities-clean-up-file-capability-reading-checkpatch-fixes.patch
add-64-bit-capability-support-to-the-kernel-checkpatch-fixes.patch
add-64-bit-capability-support-to-the-kernel-fix.patch
add-64-bit-capability-support-to-the-kernel-fix-modify-old-libcap-warning-message-checkpatch-fixes.patch
add-64-bit-capability-support-to-the-kernel-fix-modify-old-libcap-warning-message-fix.patch
smack-version-11c-simplified-mandatory-access-control-kernel-fix.patch
alpha-atomic_add_return-should-return-int.patch
alpha-fix-warning-by-fixing-flush_tlb_kernel_range.patch
pm-qos-infrastructure-and-interface.patch
pm-qos-infrastructure-and-interface-static-initialization-with-blocking-notifiers.patch
dio-array_size-cleanup-update-checkpatch-fixes.patch
uml-get-rid-of-asmlinkage-checkpatch-fixes.patch
uml-improve-detection-of-host-cmov-checkpatch-fixes.patch
uml-further-bugsc-tidying-checkpatch-fixes.patch
kernel-printkc-concerns-about-the-console-handover.patch
riscom8-fix-smp-brokenness-fix.patch
sound-oss-pss-set_io_base-always-returns-success-mark-it-void-checkpatch-fixes.patch
remove-warnings-for-longstanding-conditions-fix.patch
genericizing-iova-fix.patch
parallel-port-convert-port_mutex-to-the-mutex-api-checkpatch-fixes.patch
remove-support-for-un-needed-_extratext-section-checkpatch-fixes.patch
allow-auto-destruction-of-loop-devices-checkpatch-fixes.patch
read_current_time-cleanups.patch
read_current_time-cleanups-build-fix-fix.patch
address-hfs-on-disk-corruption-robustness-review-comments.patch
get-rid-of-nr_open-and-introduce-a-sysctl_nr_open-fix.patch
kallsyms-should-prefer-non-weak-symbols-checkpatch-fixes.patch
deprecate-smbfs-in-favour-of-cifs.patch
quota-improve-inode-list-scanning-in-add_dquot_ref-fix.patch
tty-enable-the-echoing-of-c-in-the-n_tty-discipline-checkpatch-fixes.patch
stopmachine-semaphore-to-mutex-fix.patch
parport-add-support-for-the-quatech-sppxp-100-parallel-port-pci-expresscard-fix.patch
debug_smp_processor_id-fixlets.patch
use-ilog2-in-fs-namespacec-fix.patch
system-timer-fix-crash-in-100hz-system-timer-cleanup.patch
speed-up-jiffies-conversion-functions-if-hz==user_hz.patch
drivers-isdn-hardware-eicon-debugc-fix-uninitialized-var-warning.patch
ecryptfs-make-show_options-reflect-actual-mount-options-fix.patch
rtc-ds1302-rtc-support-checkpatch-fixes.patch
add-hpet-rtc-emulation-to-rtc_drv_cmos-fix.patch
fbmon-cleanup-trailing-whitespaces-checkpatch-fixes.patch
neofb-avoid-overwriting-fb_info-fields.patch
vermilionc-use-align-not-__align_mask.patch
md-change-interate_mddev-to-for_each_mddev-fix.patch
md-change-iterate_rdev-to-rdev_for_each-fix.patch
declare-pnp-option-parsing-functions-as-__init-checkpatch-fixes.patch
isapnp-driver-semaphore-to-mutex-fix.patch
isapnp-driver-semaphore-to-mutex-fix-fix.patch
ext3-fix-lock-inversion-in-direct-io-fix.patch
kill-filp_open-checkpatch-fixes.patch
rename-open_namei-to-open_pathname-fix.patch
r-o-bind-mounts-elevate-write-count-during-entire-ncp_ioctl-fix.patch
r-o-bind-mounts-elevate-write-count-for-do_utimes.patch
r-o-bind-mounts-elevate-write-count-for-some-ioctls-checkpatch-fixes.patch
r-o-bind-mounts-elevate-write-count-for-some-ioctls-vs-forbid-user-to-change-file-flags-on-quota-files.patch
r-o-bind-mounts-elevate-write-count-opened-files-oops-fix.patch
r-o-bind-mounts-nfs-check-mnt-instead-of-superblock-directly-checkpatch-fixes.patch
r-o-bind-mounts-track-number-of-mount-writer-fix-buggy-loop-checkpatch-fixes.patch
keep-track-of-mnt_writer-state-of-struct-file-fix-warn_on-fix.patch
cgroup-simplify-space-stripping-fix.patch
memory-controller-memory-accounting-v7.patch
memory-controller-add-per-container-lru-and-reclaim-v7.patch
memory-controller-oom-handling-v7.patch
memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7.patch
memcontrol-move-mm_cgroup-to-header-file-fix.patch
memcontrol-move-mm_cgroup-to-header-file-fix-2.patch
memcontrol-move-oom-task-exclusion-to-tasklist.patch
memory-cgroup-enhancements-fix-zone-handling-in-try_to_free_mem_cgroup_page.patch
memory-cgroup-enhancements-add-status-accounting-function-for-memory-cgroup.patch
memory-cgroup-enhancements-add-memorystat-file.patch
per-zone-and-reclaim-enhancements-for-memory-controller-take-3-remember-reclaim-priority-in-memory-cgroup.patch
per-zone-and-reclaim-enhancements-for-memory-controller-take-3-modifies-vmscanc-for-isolate-globa-cgroup-lru-activity.patch
cgroups-mechanism-to-process-each-task-in-a-cgroup-cleanup.patch
cgroups-mechanism-to-process-each-task-in-a-cgroup-checkpatch-fixes.patch
hotplug-cpu-move-tasks-in-empty-cpusets-to-parent-checkpatch-fixes.patch
cpusets-update_cpumask-revision-fix.patch
cpusets-update_cpumask-revision-checkpatch-fixes.patch
drivers-edac-add-marvell-mv64x60-driver-fix.patch
introduce-flags-for-reserve_bootmem-checkpatch-fixes.patch
iget-stop-affs-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-efs-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-ext2-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-ext3-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-freevxfs-from-using-iget-and-read_inode-checkpatch-fixes.patch
iget-stop-the-minix-filesystem-from-using-iget-and-checkpatch-fixes.patch
iget-stop-procfs-from-using-iget-and-read_inode-checkpatch-fixes.patch
iget-stop-qnx4-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-romfs-from-using-iget-and-read_inode-checkpatch-fixes.patch
iget-stop-the-sysv-filesystem-from-using-iget-and-checkpatch-fixes.patch
iget-stop-ufs-from-using-iget-and-read_inode-try-checkpatch-fixes.patch
iget-stop-hostfs-from-using-iget-and-read_inode-checkpatch-fixes.patch
iget-stop-unionfs-from-using-iget-and-read_inode-fix-2.patch
disable-ext4.patch
embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-checkpatch-fixes.patch
embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-vs-git-unionfs.patch
embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-cifs-fix.patch
embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-smack-fix.patch
introduce-path_put-cifs-fix.patch
one-less-parameter-to-__d_path-checkpatch-fixes.patch
d_path-use-struct-path-in-struct-avc_audit_data-checkpatch-fixes.patch
d_path-make-get_dcookie-use-a-struct-path-argument-checkpatch-fixes.patch
use-struct-path-in-struct-svc_export-checkpatch-fixes.patch
d_path-make-d_path-use-a-struct-path-fix.patch
cleanup-the-code-managed-with-the-user_ns-option-checkpatch-fixes.patch
cleanup-the-code-managed-with-pid_ns-option-checkpatch-fixes.patch
proc-detect-duplicate-names-on-registration-fix.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-checkpatch-fixes.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-fix.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-fix-2.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-fix-3.patch
proc-seqfile-convert-proc_pid_status-to-properly-handle-pid-namespaces-nommu-fix.patch
proc-fix-openless-usage-due-to-proc_fops-flip-checkpatch-fixes.patch
intel-iommu-fault_reason_index_cleanuppatch-fix.patch
modules-make-module_address_lookup-safe-fix.patch
wait_task_stopped-simplify-and-fix-races-with-sigcont-sigkill-untrace-fix.patch
pid-sys_wait-fixes-v2-checkpatch-fixes.patch
aout-suppress-aout-library-support-if-config_arch_supports_aout-vs-git-x86.patch
aout-suppress-aout-library-support-if-config_arch_supports_aout-vs-sanitize-the-type-of-struct-useru_ar0.patch
aout-remove-unnecessary-inclusions-of-asm-linux-aouth-alpha-fix.patch
mn10300-add-the-mn10300-am33-architecture-to-the-kernel-fix.patch
rewrite-rd-fixes.patch
fs-remove-fastcall-it-is-always-empty-checkpatch-fixes.patch
kernel-remove-fastcall-in-kernel-checkpatch-fixes.patch
lib-remove-fastcall-from-lib-checkpatch-fixes.patch
remove-fastcall-from-linux-include-checkpatch-fixes.patch
constify-tables-in-kernel-sysctl_checkc-fix.patch
aoe-statically-initialise-devlist_lock.patch
xfs-convert-bex_add-to-bex_add_cpu-new-common-api-fix.patch
ufs-fix-symlink-creation-on-ufs2-fix.patch
libfs-allow-error-return-from-simple-attributes-fix.patch
fs-hfsplus-unicodec-fix-uninitialized-var-warning.patch
fs-afs-securityc-fix-uninitialized-var-warning.patch
mount-options-fix-tmpfs-fix.patch
remove-__init_refok-and-__initdata_refok-fix.patch
char-applicom-use-pci_match_id-fix.patch
add-new-string-functions-strict_strto-and-convert-kernel-params-to-use-them-fix.patch
reiser4.patch
jens-broke-reiser4patch-added-to-mm-tree.patch
page-owner-tracking-leak-detector.patch
page-owner-tracking-leak-detector-broken-on-s390.patch
nr_blockdev_pages-in_interrupt-warning.patch
slab-leaks3-default-y.patch
profile-likely-unlikely-macros-fix.patch
put_bh-debug.patch
shrink_slab-handle-bad-shrinkers.patch
getblk-handle-2tb-devices.patch
getblk-handle-2tb-devices-fix.patch
undeprecate-pci_find_device.patch
w1-build-fix.patch


2008-02-03 20:26:32

by Andrew Morton

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

On Sun, 03 Feb 2008 12:18:35 -0800 [email protected] wrote:

>
> The patch titled
> disable-ext4
> has been removed from the -mm tree. Its filename was
> disable-ext4.patch

I dropped the entire ext4 patch series, because the newly-added
convert-to-iget_locked patch has wrecked the iget-coversion patch which I
have queued. Please do not merge that patch under my feet.

When I merge David's iget coversion patches this will instead wreck the
ext4 patchset.

Dunno what to do about this sort of thing, apart from encouraging
developers to take a look at what's happening in other trees before merging
stuff.

2008-02-04 01:37:06

by Theodore Ts'o

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> When I merge David's iget coversion patches this will instead wreck the
> ext4 patchset.

That's ok, it shouldn't be hard for me to fix this up. How quickly
will you be able to merge David's iget converstion patches? Could
this get pushed to Linus, say, tomorrow?

- Ted

2008-02-04 03:16:27

by Andrew Morton

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:

> On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > When I merge David's iget coversion patches this will instead wreck the
> > ext4 patchset.
>
> That's ok, it shouldn't be hard for me to fix this up. How quickly
> will you be able to merge David's iget converstion patches?

They're about 1,000 patches back.

> Could
> this get pushed to Linus, say, tomorrow?

No.

2008-02-04 15:01:19

by Theodore Ts'o

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote:
> On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:
>
> > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > > When I merge David's iget coversion patches this will instead wreck the
> > > ext4 patchset.
> >
> > That's ok, it shouldn't be hard for me to fix this up. How quickly
> > will you be able to merge David's iget converstion patches?
>
> They're about 1,000 patches back.

OK, if you're not planning on pushing David's changes to Linus right
away, what if I pull in David's

iget-stop-ext4-from-using-iget-and-read_inode-try.patch

and push it plus some other ext4 bug fixes directly to Linus, and let
you know when that has happened so you can drop David's patch from
your queue?

David's changes to ext4 can be applied standalone without the rest of
his series, so it would be safe to push that to Linus independently
and in advance of the rest of his series. That should also help
reduce the number of inter-patch queue dependencies.

Regards,

- Ted

2008-02-04 20:12:24

by Andrew Morton

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

On Mon, 4 Feb 2008 10:00:44 -0500 Theodore Tso <[email protected]> wrote:

> On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote:
> > On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:
> >
> > > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > > > When I merge David's iget coversion patches this will instead wreck the
> > > > ext4 patchset.
> > >
> > > That's ok, it shouldn't be hard for me to fix this up. How quickly
> > > will you be able to merge David's iget converstion patches?
> >
> > They're about 1,000 patches back.
>
> OK, if you're not planning on pushing David's changes to Linus right
> away, what if I pull in David's
>
> iget-stop-ext4-from-using-iget-and-read_inode-try.patch
>
> and push it plus some other ext4 bug fixes directly to Linus, and let
> you know when that has happened so you can drop David's patch from
> your queue?

Sure, go for it.

> David's changes to ext4 can be applied standalone without the rest of
> his series, so it would be safe to push that to Linus independently
> and in advance of the rest of his series. That should also help
> reduce the number of inter-patch queue dependencies.

That patch series is kind of logjammed anyway because it breaks isofs.
Last time I discussed this with David he seemed to find this amusing rather
than an urgent problem. I'd drop the whole lot if there weren't lots of
other patches dependent upon them. Mayeb I can do a selective droppage,
but I hate going out-of-order, and merging untested patch combinations.

2008-02-04 20:24:41

by Christoph Hellwig

[permalink] [raw]
Subject: merge plans, was Re: - disable-ext4.patch removed from -mm tree

On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote:
> On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:
>
> > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > > When I merge David's iget coversion patches this will instead wreck the
> > > ext4 patchset.
> >
> > That's ok, it shouldn't be hard for me to fix this up. How quickly
> > will you be able to merge David's iget converstion patches?
>
> They're about 1,000 patches back

Care to post a merge plan so we have a slight chance to make sure not
too much crap is hiding in these 1000 patches?

2008-02-04 20:31:09

by Theodore Ts'o

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

On Mon, Feb 04, 2008 at 12:11:31PM -0800, Andrew Morton wrote:
>
> That patch series is kind of logjammed anyway because it breaks isofs.
> Last time I discussed this with David he seemed to find this amusing rather
> than an urgent problem. I'd drop the whole lot if there weren't lots of
> other patches dependent upon them. Mayeb I can do a selective droppage,
> but I hate going out-of-order, and merging untested patch combinations.
>

All of the patches which move from using iget() to iget_unlocked()
should in theory (if they are well written) be standalone and not have
any prerequisites, and a good thing to apply in and of themselves.

So maybe the right thing to do is to push all of them right away, and
then if they all can go in safely w/o breaking filesystems, we can
actually do the deed about removing the iget() interface itself, and
if not, it can wait until 2.6.26. It's not really that big of a deal
to actually nuke the interface itself, as long as we are gradually
reducing our usage of it.... Or is there some patch which David is
trying to push that desperately depends on iget() going away?

- Ted

2008-02-04 22:37:09

by Andrew Morton

[permalink] [raw]
Subject: Re: merge plans, was Re: - disable-ext4.patch removed from -mm tree

On Mon, 4 Feb 2008 15:24:18 -0500
Christoph Hellwig <[email protected]> wrote:

> On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote:
> > On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:
> >
> > > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > > > When I merge David's iget coversion patches this will instead wreck the
> > > > ext4 patchset.
> > >
> > > That's ok, it shouldn't be hard for me to fix this up. How quickly
> > > will you be able to merge David's iget converstion patches?
> >
> > They're about 1,000 patches back
>
> Care to post a merge plan so we have a slight chance to make sure not
> too much crap is hiding in these 1000 patches?

Pretty much everything up to

#
# end
#
reiser4-sb_sync_inodes.patch

2008-02-05 09:41:17

by David Howells

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

Andrew Morton <[email protected]> wrote:

> Last time I discussed this with David he seemed to find this amusing rather
> than an urgent problem.

Amusing? In what way?

I've been at LCA, and I left all but one of my machines powered down because
the local substation broke and has been giving wildly variable voltages, if at
all. I've had to replace two PSUs because of this. That's made it hard to
test stuff remotely. If you wish to view this as amusing, then by all means
do so.

David

2008-02-05 09:45:47

by Christoph Hellwig

[permalink] [raw]
Subject: Re: merge plans, was Re: - disable-ext4.patch removed from -mm tree

On Mon, Feb 04, 2008 at 02:35:29PM -0800, Andrew Morton wrote:
> On Mon, 4 Feb 2008 15:24:18 -0500
> Christoph Hellwig <[email protected]> wrote:
>
> > On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote:
> > > On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:
> > >
> > > > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > > > > When I merge David's iget coversion patches this will instead wreck the
> > > > > ext4 patchset.
> > > >
> > > > That's ok, it shouldn't be hard for me to fix this up. How quickly
> > > > will you be able to merge David's iget converstion patches?
> > >
> > > They're about 1,000 patches back
> >
> > Care to post a merge plan so we have a slight chance to make sure not
> > too much crap is hiding in these 1000 patches?
>
> Pretty much everything up to
>
> #
> # end
> #
> reiser4-sb_sync_inodes.patch

That includes the git trees? Defintive NACK to unionfs.

2008-02-05 09:53:35

by Andrew Morton

[permalink] [raw]
Subject: Re: merge plans, was Re: - disable-ext4.patch removed from -mm tree

On Tue, 5 Feb 2008 10:44:54 +0100 Christoph Hellwig <[email protected]> wrote:

> On Mon, Feb 04, 2008 at 02:35:29PM -0800, Andrew Morton wrote:
> > On Mon, 4 Feb 2008 15:24:18 -0500
> > Christoph Hellwig <[email protected]> wrote:
> >
> > > On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote:
> > > > On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:
> > > >
> > > > > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > > > > > When I merge David's iget coversion patches this will instead wreck the
> > > > > > ext4 patchset.
> > > > >
> > > > > That's ok, it shouldn't be hard for me to fix this up. How quickly
> > > > > will you be able to merge David's iget converstion patches?
> > > >
> > > > They're about 1,000 patches back
> > >
> > > Care to post a merge plan so we have a slight chance to make sure not
> > > too much crap is hiding in these 1000 patches?
> >
> > Pretty much everything up to
> >
> > #
> > # end
> > #
> > reiser4-sb_sync_inodes.patch
>
> That includes the git trees?

No, I don't merge git trees.

> Defintive NACK to unionfs.

Agree, but it'd be nice to get some movement and resolution here. The
thing's actively and enthusiastically maintained and is apparently useful.
There's not much point in allowing developers to expend cycles on something
which doesn't have a future.

2008-02-05 21:26:45

by Mingming Cao

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

On Mon, 2008-02-04 at 10:00 -0500, Theodore Tso wrote:
> On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote:
> > On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:
> >
> > > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > > > When I merge David's iget coversion patches this will instead wreck the
> > > > ext4 patchset.
> > >
> > > That's ok, it shouldn't be hard for me to fix this up. How quickly
> > > will you be able to merge David's iget converstion patches?
> >
> > They're about 1,000 patches back.
>
> OK, if you're not planning on pushing David's changes to Linus right
> away, what if I pull in David's
>
> iget-stop-ext4-from-using-iget-and-read_inode-try.patch
>
> and push it plus some other ext4 bug fixes directly to Linus, and let
> you know when that has happened so you can drop David's patch from
> your queue?
>
> David's changes to ext4 can be applied standalone without the rest of
> his series, so it would be safe to push that to Linus independently
> and in advance of the rest of his series.

I get compile error when builing ext4 patch queue with
iget-stop-ext4-from-using-iget-and-read_inode-try.patch applied, against
2.6.24-git14.

It seems iget-stop-ext4-from-using-iget-and-read_inode-try.patch depends
on patches:
[PATCH 01/31] Add an ERR_CAST() macro to complement ERR_PTR and co.
[PATCH 03/32] IGET: Introduce a function to register iget failure

Mingming

> That should also help
> reduce the number of inter-patch queue dependencies.
>
> Regards,
>
> - Ted
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2008-02-06 01:02:19

by Mingming Cao

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

On Tue, 2008-02-05 at 13:26 -0800, Mingming Cao wrote:
> On Mon, 2008-02-04 at 10:00 -0500, Theodore Tso wrote:
> > On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote:
> > > On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:
> > >
> > > > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > > > > When I merge David's iget coversion patches this will instead wreck the
> > > > > ext4 patchset.
> > > >
> > > > That's ok, it shouldn't be hard for me to fix this up. How quickly
> > > > will you be able to merge David's iget converstion patches?
> > >
> > > They're about 1,000 patches back.
> >
> > OK, if you're not planning on pushing David's changes to Linus right
> > away, what if I pull in David's
> >
> > iget-stop-ext4-from-using-iget-and-read_inode-try.patch
> >
> > and push it plus some other ext4 bug fixes directly to Linus, and let
> > you know when that has happened so you can drop David's patch from
> > your queue?
> >
> > David's changes to ext4 can be applied standalone without the rest of
> > his series, so it would be safe to push that to Linus independently
> > and in advance of the rest of his series.
>
> I get compile error when builing ext4 patch queue with
> iget-stop-ext4-from-using-iget-and-read_inode-try.patch applied, against
> 2.6.24-git14.
>
> It seems iget-stop-ext4-from-using-iget-and-read_inode-try.patch depends
> on patches:
> [PATCH 01/31] Add an ERR_CAST() macro to complement ERR_PTR and co.
> [PATCH 03/32] IGET: Introduce a function to register iget failure

It seems to me the easiest way to bring ext4 patches back to mm tree, is
to carry above two patches in ext4 patch queue, like we did for other
ext4 patches that depend on generic code in the past.

So I added above two patches to ext4 patch queue, now that ext4 patches
could apply cleanly to linus git tree, and Andrew should able to easily
pull ext4 patches after removing the duplicated patches.

Ted, I have the ext4 patch queue updated for this.

Regards,
Mingming

2008-02-06 01:58:14

by Andrew Morton

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

On Tue, 05 Feb 2008 17:02:20 -0800 Mingming Cao <[email protected]> wrote:

> On Tue, 2008-02-05 at 13:26 -0800, Mingming Cao wrote:
> > On Mon, 2008-02-04 at 10:00 -0500, Theodore Tso wrote:
> > > On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote:
> > > > On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:
> > > >
> > > > > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > > > > > When I merge David's iget coversion patches this will instead wreck the
> > > > > > ext4 patchset.
> > > > >
> > > > > That's ok, it shouldn't be hard for me to fix this up. How quickly
> > > > > will you be able to merge David's iget converstion patches?
> > > >
> > > > They're about 1,000 patches back.
> > >
> > > OK, if you're not planning on pushing David's changes to Linus right
> > > away, what if I pull in David's
> > >
> > > iget-stop-ext4-from-using-iget-and-read_inode-try.patch
> > >
> > > and push it plus some other ext4 bug fixes directly to Linus, and let
> > > you know when that has happened so you can drop David's patch from
> > > your queue?
> > >
> > > David's changes to ext4 can be applied standalone without the rest of
> > > his series, so it would be safe to push that to Linus independently
> > > and in advance of the rest of his series.
> >
> > I get compile error when builing ext4 patch queue with
> > iget-stop-ext4-from-using-iget-and-read_inode-try.patch applied, against
> > 2.6.24-git14.
> >
> > It seems iget-stop-ext4-from-using-iget-and-read_inode-try.patch depends
> > on patches:
> > [PATCH 01/31] Add an ERR_CAST() macro to complement ERR_PTR and co.
> > [PATCH 03/32] IGET: Introduce a function to register iget failure
>
> It seems to me the easiest way to bring ext4 patches back to mm tree, is
> to carry above two patches in ext4 patch queue, like we did for other
> ext4 patches that depend on generic code in the past.

It doesn't matter a lot because I won't be doing another -mm until all this
is merged up anyway.

> So I added above two patches to ext4 patch queue, now that ext4 patches
> could apply cleanly to linus git tree, and Andrew should able to easily
> pull ext4 patches after removing the duplicated patches.
>
> Ted, I have the ext4 patch queue updated for this.

This means that I merge part of the iget patch series, then twiddle thumbs
until the ext4 tree merges, then merge the remainder of the iget series.

So unless Ted intends to merge RSN I think it'd be preferable if I were to
just merge the lot, sorry.

2008-02-06 02:21:42

by Mingming Cao

[permalink] [raw]
Subject: Re: - disable-ext4.patch removed from -mm tree

On Tue, 2008-02-05 at 17:57 -0800, Andrew Morton wrote:
> On Tue, 05 Feb 2008 17:02:20 -0800 Mingming Cao <[email protected]> wrote:
>
> > On Tue, 2008-02-05 at 13:26 -0800, Mingming Cao wrote:
> > > On Mon, 2008-02-04 at 10:00 -0500, Theodore Tso wrote:
> > > > On Sun, Feb 03, 2008 at 07:15:40PM -0800, Andrew Morton wrote:
> > > > > On Sun, 3 Feb 2008 20:36:26 -0500 Theodore Tso <[email protected]> wrote:
> > > > >
> > > > > > On Sun, Feb 03, 2008 at 12:25:51PM -0800, Andrew Morton wrote:
> > > > > > > When I merge David's iget coversion patches this will instead wreck the
> > > > > > > ext4 patchset.
> > > > > >
> > > > > > That's ok, it shouldn't be hard for me to fix this up. How quickly
> > > > > > will you be able to merge David's iget converstion patches?
> > > > >
> > > > > They're about 1,000 patches back.
> > > >
> > > > OK, if you're not planning on pushing David's changes to Linus right
> > > > away, what if I pull in David's
> > > >
> > > > iget-stop-ext4-from-using-iget-and-read_inode-try.patch
> > > >
> > > > and push it plus some other ext4 bug fixes directly to Linus, and let
> > > > you know when that has happened so you can drop David's patch from
> > > > your queue?
> > > >
> > > > David's changes to ext4 can be applied standalone without the rest of
> > > > his series, so it would be safe to push that to Linus independently
> > > > and in advance of the rest of his series.
> > >
> > > I get compile error when builing ext4 patch queue with
> > > iget-stop-ext4-from-using-iget-and-read_inode-try.patch applied, against
> > > 2.6.24-git14.
> > >
> > > It seems iget-stop-ext4-from-using-iget-and-read_inode-try.patch depends
> > > on patches:
> > > [PATCH 01/31] Add an ERR_CAST() macro to complement ERR_PTR and co.
> > > [PATCH 03/32] IGET: Introduce a function to register iget failure
> >
> > It seems to me the easiest way to bring ext4 patches back to mm tree, is
> > to carry above two patches in ext4 patch queue, like we did for other
> > ext4 patches that depend on generic code in the past.
>
> It doesn't matter a lot because I won't be doing another -mm until all this
> is merged up anyway.
>
> > So I added above two patches to ext4 patch queue, now that ext4 patches
> > could apply cleanly to linus git tree, and Andrew should able to easily
> > pull ext4 patches after removing the duplicated patches.
> >
> > Ted, I have the ext4 patch queue updated for this.
>
> This means that I merge part of the iget patch series, then twiddle thumbs
> until the ext4 tree merges, then merge the remainder of the iget series.
>
> So unless Ted intends to merge RSN I think it'd be preferable if I were to
> just merge the lot, sorry.
>

I did not suggesting to push the generic iget changes via ext4 git tree
by Ted. Maybe I did not make this clear,sorry for the confusion. It make
sense to push that whole series by you. What I suggest is just adjust
the ext4 patches to make it easy to apply the the mm tree after you done
the merge, and allow ext4 patch queue to build before then.

Mingming

Mingming