Andrew,
Thanks, we may look at removing uio_read completely since it has
very limited use. That would potentially remove a source file and
a header file too. We will let you know when we have something to
replace your patch.
Thanks,
David
akpm@xxxxxxxx wrote:
> The patch titled
>
> xfs: rename uio_read()
>
> has been added to the -mm tree. Its filename is
>
> xfs-rename-uio_read.patch
>
> See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
> out what to do about this
>
> ------------------------------------------------------
> Subject: xfs: rename uio_read()
> From: Andrew Morton <akpm@xxxxxxxx>
>
> To xfs_uio_read(). uio_read() is too generic-sounding, and conflicts with the
> user-level IO driver in Greg's tree.
>
> Cc: <xfs-masters@xxxxxxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
> ---
>
> fs/xfs/support/move.c | 2 +-
> fs/xfs/support/move.h | 2 +-
> fs/xfs/xfs_dir2.c | 2 +-
> fs/xfs/xfs_vnodeops.c | 4 ++--
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff -puN fs/xfs/support/move.c~xfs-rename-uio_read fs/xfs/support/move.c
> --- a/fs/xfs/support/move.c~xfs-rename-uio_read
> +++ a/fs/xfs/support/move.c
> @@ -22,7 +22,7 @@
> * as we go.
> */
> int
> -uio_read(caddr_t src, size_t len, struct uio *uio)
> +xfs_uio_read(caddr_t src, size_t len, struct uio *uio)
> {
> size_t count;
>
> diff -puN fs/xfs/support/move.h~xfs-rename-uio_read fs/xfs/support/move.h
> --- a/fs/xfs/support/move.h~xfs-rename-uio_read
> +++ a/fs/xfs/support/move.h
> @@ -65,6 +65,6 @@ struct uio {
> typedef struct uio uio_t;
> typedef struct iovec iovec_t;
>
> -extern int uio_read (caddr_t, size_t, uio_t *);
> +extern int xfs_uio_read (caddr_t, size_t, uio_t *);
>
> #endif /* __XFS_SUPPORT_MOVE_H__ */
> diff -puN fs/xfs/xfs_dir2.c~xfs-rename-uio_read fs/xfs/xfs_dir2.c
> --- a/fs/xfs/xfs_dir2.c~xfs-rename-uio_read
> +++ a/fs/xfs/xfs_dir2.c
> @@ -678,7 +678,7 @@ xfs_dir2_put_dirent64_uio(
> idbp->d_off = pa->cook;
> idbp->d_name[namelen] = '\0';
> memcpy(idbp->d_name, pa->name, namelen);
> - rval = uio_read((caddr_t)idbp, reclen, uio);
> + rval = xfs_uio_read((caddr_t)idbp, reclen, uio);
> pa->done = (rval == 0);
> return rval;
> }
> diff -puN fs/xfs/xfs_vnodeops.c~xfs-rename-uio_read fs/xfs/xfs_vnodeops.c
> --- a/fs/xfs/xfs_vnodeops.c~xfs-rename-uio_read
> +++ a/fs/xfs/xfs_vnodeops.c
> @@ -1013,7 +1013,7 @@ xfs_readlink(
> pathlen = (int)ip->i_d.di_size;
>
> if (ip->i_df.if_flags & XFS_IFINLINE) {
> - error = uio_read(ip->i_df.if_u1.if_data, pathlen, uiop);
> + error = xfs_uio_read(ip->i_df.if_u1.if_data, pathlen, uiop);
> }
> else {
> /*
> @@ -1044,7 +1044,7 @@ xfs_readlink(
> byte_cnt = pathlen;
> pathlen -= byte_cnt;
>
> - error = uio_read(XFS_BUF_PTR(bp), byte_cnt, uiop);
> + error = xfs_uio_read(XFS_BUF_PTR(bp), byte_cnt, uiop);
> xfs_buf_relse (bp);
> }
>
> _
>
> Patches currently in -mm which might be from akpm@xxxxxxxx are
>
> origin.patch
> git-acpi.patch
> acpi-asus-s3-resume-fix.patch
> sony_apci-resume.patch
> git-alsa.patch
> kauditd_thread-warning-fix.patch
> git-block.patch
> git-block-hack.patch
> revert-gregkh-driver-class_device_rename-remove.patch
> revert-gregkh-driver-network-class_device-to-device.patch
> revert-gregkh-driver-tty-device.patch
> revert-gregkh-driver-mem-devices.patch
> drivers-base-check-errors.patch
> scsi-device_reprobe-can-fail.patch
> git-drm.patch
> git-dvb.patch
> git-dvb-fixup.patch
> git-gfs2.patch
> git-ia64.patch
> git-ieee1394-fixup.patch
> git-input.patch
> git-intelfb-fixup.patch
> git-kbuild.patch
> revert-libata-ignore-cfa-signature-while-sanity-checking-an-atapi-device.patch
> git-libata-all.patch
> 1-of-2-jmicron-driver-fix.patch
> via-pata-controller-xfer-fixes-fix.patch
> git-netdev-all.patch
> drivers-net-ns83820c-add-paramter-to-disable-auto.patch
> git-net.patch
> git-net-fixup.patch
> git-nfs-fixup.patch
> git-pcmcia-fixup.patch
> git-powerpc.patch
> tickle-nmi-watchdog-on-serial-output-fix.patch
> serial-fix-uart_bug_txen-test.patch
> fix-gregkh-pci-msi-blacklist-pci-e-chipsets-depending-on-hypertransport-msi-capability.patch
> pcie-check-and-return-bus_register-errors-fix.patch
> git-scsi-misc.patch
> git-scsi-misc-fixup.patch
> revert-scsi-improve-inquiry-printing.patch
> git-scsi-misc-nlmsg_multicast-fix.patch
> git-block-vs-git-sas.patch
> fix-panic-when-reinserting-adaptec-pcmcia-scsi-card.patch
> git-scsi-target-fixup.patch
> git-scsi-target-vs-git-block.patch
> gregkh-usb-usb-storage-add-rio-karma-eject-support-fix.patch
> fix-gregkh-usb-usbcore-add-autosuspend-autoresume-infrastructure.patch
> git-watchdog.patch
> revert-x86_64-mm-detect-cfi.patch
> fix-x86_64-mm-i386-backtrace-ebp-fallback.patch
> fix-x86_64-mm-i386-pda-smp-processorid.patch
> fix-x86_64-mm-spinlock-cleanup.patch
> adix-tree-rcu-lockless-readside-update-tidy.patch
> mm-tracking-shared-dirty-pages-checks.patch
> mm-tracking-shared-dirty-pages-wimp.patch
> convert-i386-numa-kva-space-to-bootmem-tidy.patch
> reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem-tidy.patch
> reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-cleanup.patch
> reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-fix.patch
> reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix.patch
> out-of-memory-notifier-tidy.patch
> mm-swap-write-failure-fixup-fix.patch
> slab-optimize-kmalloc_node-the-same-way-as-kmalloc-fix.patch
> slab-fix-lockdep-warnings-fix-2.patch
> have-x86-use-add_active_range-and-free_area_init_nodes-fix.patch
> zone_reclaim-dynamic-slab-reclaim-tidy.patch
> vm-add-per-zone-writeout-counter.patch
> acx1xx-wireless-driver.patch
> tiacx-pci-build-fix.patch
> tiacx-ia64-fix.patch
> tiacx-build-fix.patch
> binfmt_elf-consistently-use-loff_t.patch
> nommu-set-bdi-capabilities-for-dev-mem-and-dev-kmem-tidy.patch
> nommu-move-the-fallback-arch_vma_name-to-a-sensible-place-fix.patch
> convert-i386-summit-subarch-to-use-srat-info-for-apicid_to_node-calls-tidy.patch
> i386-adds-smp_call_function_single-fix.patch
> swsusp-write-timer.patch
> swsusp-write-speedup.patch
> swsusp-read-timer.patch
> swsusp-read-speedup.patch
> swsusp-read-speedup-fix.patch
> swsusp-read-speedup-cleanup.patch
> swsusp-read-speedup-cleanup-2.patch
> swsusp-read-speedup-fix-fix-2.patch
> deprecate-smbfs-in-favour-of-cifs.patch
> edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
> inode_diet-replace-inodeugeneric_ip-with-inodei_private-gfs-fix.patch
> x86-microcode-microcode-driver-cleanup-tidy.patch
> x86-microcode-add-sysfs-and-hotplug-support-fix.patch
> eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch
> add-address_space_operationsbatch_write-fix.patch
> alloc_fdtable-cleanup.patch
> sysctl-allow-proc-sys-without-sys_sysctl-fix.patch
> add-probe_kernel_address.patch
> x86-use-probe_kernel_address-in-handle_bug.patch
> blockdevc-check-errors.patch
> let-warn_on-warn_on_once-return-the-condition-fix.patch
> let-warn_on-warn_on_once-return-the-condition-fix-2.patch
> omap-add-watchdog-driver-support-tweaks.patch
> move-valid_dma_direction-from-x86_64-to-generic-code-fix.patch
> single-bit-flip-detector-tidy.patch
> fix-unserialized-task-files-changing-fix.patch
> tty-make-termios_sem-a-mutex-fix.patch
> solaris-emulation-incorrect-tty-locking-fix.patch
> solaris-emulation-incorrect-tty-locking-fix-2.patch
> cpuset-top_cpuset-tracks-hotplug-changes-to-node_online_map-fix.patch
> remove-sound-oss-copying.patch
> maximum-latency-tracking-infrastructure-tidy.patch
> fs-nameic-replace-multiple-current-fs-by-shortcut-variable-tidy.patch
> call-mm-page-writebackcset_ratelimit-when-new-pages-tidy.patch
> sys-modules-patch-allow-full-length-section-names.patch
> expand_fdtable-remove-pointless-unlocklock.patch
> ntp-move-all-the-ntp-related-code-to-ntpc-fix.patch
> reiserfs-on-demand-bitmap-loading.patch
> streamline-generic_file_-interfaces-and-filemap-gfs-fix.patch
> add-vector-aio-support-fix.patch
> csa-basic-accounting-over-taskstats-fix.patch
> fs-cache-make-kafs-use-fs-cache-fix.patch
> fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
> nfs-use-local-caching-12-fix.patch
> stack-overflow-safe-kdump-crash_use_safe_smp_processor_id-fix.patch
> generic-ioremap_page_range-x86_64-conversion-fix.patch
> vfs-make-filldir_t-and-struct-kstat-deal-in-64-bit-inode-numbers-alpha-fix.patch
> some-cleanup-in-the-pipe-code-tidy.patch
> support-piping-into-commands-in-proc-sys-kernel-core_pattern-fix.patch
> move-pidmap-to-pspaceh-fix.patch
> kprobes-handle-symbol-resolution-when-modulesymbol-is-specified-tidy.patch
> isdn-work-around-excessive-udelay.patch
> knfsd-add-a-callback-for-when-last-rpc-thread-finishes-tidy.patch
> knfsd-add-a-callback-for-when-last-rpc-thread-finishes-fix.patch
> knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks.patch
> knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy.patch
> knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-fix.patch
> knfsd-have-ext2-reject-file-handles-with-bad-inode-numbers-early-tidy.patch
> knfsd-make-ext3-reject-filehandles-referring-to-invalid-inode-numbers-tidy.patch
> knfsd-drop-serv-option-to-svc_recv-and-svc_process-nfs-callback-fix-nfs-callback-fix.patch
> knfsd-move-tempsock-aging-to-a-timer-tidy.patch
> sched-remove-unnecessary-sched-group-allocations-fix.patch
> swap_prefetch-vs-zoned-counters.patch
> ecryptfs-mmap-operations.patch
> ecryptfs-alpha-build-fix.patch
> ecryptfs-more-elegant-aes-key-size-manipulation.patch
> ecryptfs-get_sb_dev-fix.patch
> make-kmem_cache_destroy-return-void-ecryptfs.patch
> namespaces-add-nsproxy.patch
> namespaces-utsname-switch-to-using-uts-namespaces.patch
> namespaces-utsname-use-init_utsname-when-appropriate.patch
> namespaces-utsname-implement-utsname-namespaces.patch
> namespaces-utsname-sysctl-hack.patch
> namespaces-utsname-switch-to-using-uts-namespaces-klibc-bit-sparc.patch
> ipc-namespace-core.patch
> readahead-sysctl-parameters-fix.patch
> make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
> make-kmem_cache_destroy-return-void-reiser4.patch
> reiser4-hardirq-include-fix.patch
> reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
> reiser4-get_sb_dev-fix.patch
> reiser4-vs-zoned-allocator.patch
> reiser4-rename-generic_sounding_globalspatch-fix.patch
> hpt3xx-rework-rate-filtering-tidy.patch
> genirq-convert-the-i386-architecture-to-irq-chips.patch
> genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
> genirq-msi-simplify-msi-enable-and-disable.patch
> genirq-ia64-irq-dynamic-irq-support.patch
> genirq-msi-only-build-msi-apicc-on-ia64-fix.patch
> genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
> genirq-x86_64-irq-make-vector_irq-per-cpu-fix.patch
> genirq-x86_64-irq-make-vector_irq-per-cpu-warning-fix.patch
> add-hypertransport-capability-defines-fix.patch
> initial-generic-hypertransport-interrupt-support-Kconfig-fix.patch
> srcu-report-out-of-memory-errors-fixlet.patch
> nr_blockdev_pages-in_interrupt-warning.patch
> device-suspend-debug.patch
> slab-leaks3-default-y.patch
> x86-kmap_atomic-debugging.patch
> restore-rogue-readahead-printk.patch
> input_register_device-debug.patch
> put_bh-debug.patch
> acpi_format_exception-debug.patch
> jmicron-warning-fix.patch
> xfs-rename-uio_read.patch
>
--
David Chatterton Phone: +61 3 9963 1934
XFS Engineering Manager Mobile: +61 409 154 121
SGI Australia http://www.sgi.com/products/storage
|