The patch titled git-nfsd-broke-reiser4 has been added to the -mm tree. Its filename is git-nfsd-broke-reiser4.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: git-nfsd-broke-reiser4 From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> fs/reiser4/export_ops.c: In function 'reiser4_decode_fh': fs/reiser4/export_ops.c:96: error: 'const struct export_operations' has no member named 'find_exported_dentry' fs/reiser4/export_ops.c:96: warning: type defaults to 'int' in declaration of 'fn' fs/reiser4/export_ops.c:98: error: 'const struct export_operations' has no member named 'find_exported_dentry' fs/reiser4/export_ops.c:99: warning: comparison between pointer and integer fs/reiser4/export_ops.c:101: error: called object 'fn' is not a function fs/reiser4/export_ops.c: At top level: fs/reiser4/export_ops.c:282: error: unknown field 'decode_fh' specified in initializer fs/reiser4/export_ops.c:282: warning: initialization from incompatible pointer type fs/reiser4/export_ops.c:284: error: unknown field 'get_dentry' specified in initializer fs/reiser4/export_ops.c:285: warning: excess elements in struct initializer fs/reiser4/export_ops.c:285: warning: (near initialization for 'reiser4_export_operations') help! Cc: J. Bruce Fields <bfields@xxxxxxxxxxxxxx> Cc: Edward Shishkin <edward@xxxxxxxxxxx> Cc: "Vladimir V. Saveliev" <vs@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/reiser4/export_ops.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff -puN fs/reiser4/export_ops.c~git-nfsd-broke-reiser4 fs/reiser4/export_ops.c --- a/fs/reiser4/export_ops.c~git-nfsd-broke-reiser4 +++ a/fs/reiser4/export_ops.c @@ -86,7 +86,7 @@ static struct dentry *reiser4_decode_fh( object_on_wire_init(&object); object_on_wire_init(&parent); - +#if 0 addr = decode_inode(super, addr, &object); if (!IS_ERR(addr)) { if (with_parent) @@ -105,12 +105,14 @@ static struct dentry *reiser4_decode_fh( addr = (char *)d; } } - object_on_wire_done(&object); object_on_wire_done(&parent); reiser4_exit_context(ctx); return (void *)addr; +#else + return ERR_PTR(-EINVAL); +#endif } /* @@ -279,9 +281,9 @@ static struct dentry *reiser4_get_dentry struct export_operations reiser4_export_operations = { .encode_fh = reiser4_encode_fh, - .decode_fh = reiser4_decode_fh, +// .decode_fh = reiser4_decode_fh, .get_parent = reiser4_get_dentry_parent, - .get_dentry = reiser4_get_dentry +// .get_dentry = reiser4_get_dentry }; /* _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch fix-dac960-driver-on-machines-which-dont-support-64-bit-dma-fix.patch atyfb-force-29mhz-xtal-on-g3-powerbooks.patch wake-up-mandatory-locks-waiter-on-chmod-fix.patch slow-down-printk-during-boot.patch slow-down-printk-during-boot-fix-2.patch git-acpi.patch acpi-add-reboot-mechanism.patch git-alsa.patch alsa-procfs-fix.patch working-3d-dri-intel-agpko-resume-for-i815-chip.patch powerpc-proper-defconfig-for-crosscompiles-fix.patch revert-gregkh-driver-warn-when-statically-allocated-kobjects-are-used.patch fix-gregkh-driver-sysfs-spit-a-warning-to-users-when-they-try-to-create-a-duplicate-sysfs-file.patch git-dvb.patch git-dvb-fixup-2.patch git-dvb-build-fix.patch i2c-i801-smbus-patch-for-intel-tolapai-fix.patch git-infiniband.patch infiniband-work-around-gcc-slub-problem.patch git-input.patch git-input-fixup.patch adbhid-produce-all-capslock-key-events.patch console-keyboard-events-and-accessibility-fix.patch console-keyboard-events-and-accessibility-fix-2.patch git-jg-misc-revert-scsi-diff.patch git-jg-misc-fix.patch git-kbuild.patch git-kvm.patch git-libata-all.patch ata-add-the-sw-ncq-support-to-sata_nv-for-mcp51-mcp55-mcp61patch.patch ide-arm-hack.patch git-mips.patch mips-add-gpio-support-to-the-bcm947xx-platform-update.patch git-mmc.patch git-mmc-fixup2.patch mmc-fix-gregkh-driver-driver-core-change-add_uevent_var-to-use-a-struct.patch gregkh-driver-driver-core-change-add_uevent_var-to-use-a-struct-vs-git-mmc.patch git-mtd.patch git-net.patch git-net-fixup.patch nit-net-skge-build-fix.patch revert-8139too-clean-up-i-o-remapping.patch net-atm-lecc-printk-warning-fix.patch git-backlight.patch git-backlight-build-fix.patch git-backlight-dependency-fix.patch git-net-vs-git-nfs.patch git-nfs-vs-git-unionfs.patch git-nfsd.patch git-nfsd-fixup.patch git-ocfs2.patch revert-gregkh-pci-pci_bridge-device.patch pci-remove-irritating-try-pci=assign-busses-warning.patch fix-ide-legacy-mode-resources-fix.patch git-s390.patch git-scsi-misc.patch git-scsi-misc-fixup.patch git-scsi-misc-arcmsr-build-fix.patch advansys-printk-fix.patch git-block-fixup.patch git-block-fix-headers_check.patch git-unionfs.patch git-unionfs-fix-2.patch fix-gregkh-usb-usb-sisusb2vga-convert-printk-to-dev_-macros.patch git-wireless.patch git-wireless-fixup.patch git-wireless-vs-gregkh-driver-driver-core-change-add_uevent_var-to-use-a-struct.patch git-net-vs-git-wireless.patch git-net-vs-git-wireless-2.patch net-add-ath5k-wireless-driver-fix.patch intel_cacheinfo-misc-section-annotation-fixes.patch ich-force-hpet-ich7-or-later-quirk-to-force-detect-enable-fix.patch ich-force-hpet-ich5-quirk-to-force-detect-enable-fix.patch x86_64-check-and-enable-mmconfig-for-amd-family-10h-opteron-fix.patch x86_64-set-cfg_size-for-amd-family-10h-in-case-mmconfig-is-fix.patch git-kgdb-fixup.patch i386-apic-fix-4-bit-apicid-assumption-of-mach-default.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch sparsemem-record-when-a-section-has-a-valid-mem_map-fix.patch readahead-combine-file_ra_stateprev_index-prev_offset-into-prev_pos-fix.patch readahead-combine-file_ra_stateprev_index-prev_offset-into-prev_pos-fix-2.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch fs-introduce-write_begin-write_end-and-perform_write-aops.patch git-nfs-vs-nfs-convert-to-new-aops.patch memoryless-nodes-introduce-mask-of-nodes-with-memory-fix.patch memoryless-nodes-fixup-uses-of-node_online_map-in-generic-code-fix-2.patch categorize-gfp-flags-fix.patch bias-the-location-of-pages-freed-for-min_free_kbytes-in-the-same-max_order_nr_pages-blocks.patch maps2-move-the-page-walker-code-to-lib.patch maps2-add-proc-pid-pagemap-interface.patch maps2-make-proc-pid-smaps-optional-under-config_embeddedpatch-fix.patch slub-slab-validation-move-tracking-information-alloc-outside-of-melstuff.patch hugetlbfs-read-support-fix.patch mm-mempolicyc-cleanups-fix.patch mm-bdi-init-hooks.patch slab-api-remove-useless-ctor-parameter-and-reorder-parameters-fix.patch security-convert-lsm-into-a-static-interface-fix.patch security-convert-lsm-into-a-static-interface-fix-2.patch security-convert-lsm-into-a-static-interface-fix-unionfs.patch security-convert-lsm-into-a-static-interface-vs-fix-null-pointer-dereference-in-__vm_enough_memory.patch file-capabilities-clear-caps-cleanup-fix.patch capabilityh-remove-include-of-currenth.patch serial-turn-serial-console-suspend-a-boot-rather-than-compile-time-option-update.patch cache-pipe-buf-page-address-for-non-highmem-arch.patch softlockup-add-a-proc-tuning-parameter-fix.patch force-erroneous-inclusions-of-compiler-h-files-to-be-errors-fix.patch driver-for-the-atmel-on-chip-ssc-on-at32ap-and-at91-fix.patch add-kernel-notifierc-fix.patch do_sys_poll-simplify-playing-with-on-stack-data-fix.patch pcmcia-compactflash-driver-for-pa-semi-electra-boards.patch add-in-sunos-41x-compatible-mode-for-ufs-fix.patch core_pattern-fix-up-a-few-miscellaneous-bugs-fix.patch printk-add-interfaces-for-external-access-to-the-log-buffer-fix.patch deprecate-aout-elf-interpreters-fix.patch ext2-ext3-ext4-add-block-bitmap-validation-fix.patch pie-executable-randomization-fix-2.patch i386-and-x86_64-randomize-brk-fix.patch binfmt_flat-warning-fixes.patch console-events-and-accessibility-fix.patch send-quota-messages-via-netlink-fix-fix.patch dir_index-error-out-instead-of-bug-on-corrupt-dx-dirs.patch modpost-detect-unterminated-device-id-lists-fix.patch i2o-fix-defined-but-not-used-build-warnings-fix.patch procfs-detect-duplicate-names-fix.patch procfs-detect-duplicate-names-fix-fix-2.patch keys-make-request_key-and-co-fundamentally-asynchronous-vs-git-mmc.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-2.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-3.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-4.patch writeback-fix-comment-use-helper-function.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-5.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-6.patch writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-7.patch revert-faster-ext2_clear_inode.patch ext2-reservations-fix-for-percpu_counter-changes.patch ecryptfs-printk-warning-fixes.patch tdfxfb-mtrr-support-fix.patch fbdev-fb_create_modedb-non-static-int-first-=-1-fix.patch intel-fb-support-for-interlaced-video-modes.patch md-software-raid-autodetect-dev-list-not-array-fix.patch intel-iommu-pci-generic-helper-function.patch intel-iommu-iova-allocation-and-management-routines.patch intel-iommu-intel-iommu-driver.patch intel-iommu-iommu-floppy-workaround.patch 64-bit-i_version-afs-fixes.patch slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-revoke.patch revoke-wire-up-i386-system-calls.patch revoke-vs-git-block.patch task-containersv11-basic-task-container-framework-fix.patch task-containersv11-shared-container-subsystem-group-arrays-include-fix.patch add-containerstats-v3-fix.patch pid-namespaces-dynamic-kmem-cache-allocator-for-pid-namespaces-fix.patch pid-namespaces-define-is_global_init-and-is_container_init-fix.patch pid-namespaces-define-is_global_init-and-is_container_init-versus-x86_64-mm-i386-show-unhandled-signals-v3.patch fs-superc-use-list_for_each_entry-instead-of-list_for_each-fix.patch pid-namespaces-helpers-to-find-the-task-by-its-numerical-ids-fix.patch pid-namespaces-changes-to-show-virtual-ids-to-user-use-find_task_by_pid_ns-in-places-that-operate-with-virtual-fix.patch pid-namespaces-changes-to-show-virtual-ids-to-user-use-find_task_by_pid_ns-in-places-that-operate-with-virtual-fix-2.patch pid-namespaces-changes-to-show-virtual-ids-to-user-use-find_task_by_pid_ns-in-places-that-operate-with-virtual-fix-3.patch pid-namespaces-changes-to-show-virtual-ids-to-user-fix.patch isolate-some-explicit-usage-of-task-tgid-fix-fix.patch memory-controller-memory-accounting-v7-fix.patch memory-controller-add-per-container-lru-and-reclaim-v7-fix.patch remove-bits_to_type-macro-fix.patch use-helpers-to-obtain-task-pid-in-printks-drm-fix.patch hotplug-cpu-migrate-a-task-within-its-cpuset-fix.patch powerpc-lock-bitops-fix.patch ipc-integrate-ipc_checkid-into-ipc_lock-fix.patch reiser4.patch git-block-vs-reiser4.patch git-nfsd-broke-reiser4.patch page-owner-tracking-leak-detector.patch profile-likely-unlikely-macros-fix.patch check_dirty_inode_list.patch w1-build-fix.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