The patch titled
nfs-use-local-caching-fix
has been removed from the -mm tree. Its filename is
nfs-use-local-caching-fix.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Andrew Morton <akpm@xxxxxxxx>
fs/nfs/inode.c: In function `nfs_fhget':
fs/nfs/inode.c:318: structure has no member named `fscache'
fs/nfs/inode.c: In function `init_nfs_fs':
fs/nfs/inode.c:1182: warning: implicit declaration of function `nfs_register_fscache'
fs/nfs/inode.c:1232: warning: implicit declaration of function `nfs_unregister_fscache'
Cc: David Howells <dhowells@xxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfs/inode.c | 2 ++
fs/nfs/nfs-fscache.h | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff -puN fs/nfs/inode.c~nfs-use-local-caching-fix fs/nfs/inode.c
--- devel/fs/nfs/inode.c~nfs-use-local-caching-fix 2006-05-11 16:05:08.000000000 -0700
+++ devel-akpm/fs/nfs/inode.c 2006-05-11 16:05:43.000000000 -0700
@@ -315,7 +315,9 @@ nfs_fhget(struct super_block *sb, struct
memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
nfsi->cache_access.cred = NULL;
+#ifdef CONFIG_NFS_FSCACHE
nfsi->fscache = NULL;
+#endif
if (maycache)
nfs_fhget_fscookie(sb, nfsi);
diff -puN fs/nfs/nfs-fscache.h~nfs-use-local-caching-fix fs/nfs/nfs-fscache.h
--- devel/fs/nfs/nfs-fscache.h~nfs-use-local-caching-fix 2006-05-11 16:06:28.000000000 -0700
+++ devel-akpm/fs/nfs/nfs-fscache.h 2006-05-11 16:07:33.000000000 -0700
@@ -142,14 +142,12 @@ void nfs_zap_fscookie(struct nfs_server
nfsi->fscache = NULL;
}
-static inline
-int nfs_register_fscache(void)
+static inline int nfs_register_fscache(void)
{
return fscache_register_netfs(&nfs_cache_netfs);
}
-static inline
-void nfs_unregister_fscache(void)
+static inline void nfs_unregister_fscache(void)
{
fscache_unregister_netfs(&nfs_cache_netfs);
}
@@ -164,6 +162,8 @@ static inline void nfs_zap_fscookie(stru
static inline void nfs_renew_fscookie(struct nfs_server *server, struct nfs_inode *nfsi) {}
static inline int nfs_register_netfs(void) { return 0; }
static inline void nfs_unregister_netfs(void) {}
+static inline int nfs_register_fscache(void) { return 0; }
+static inline void nfs_unregister_fscache(void) { }
#endif
#endif /* _NFS_FSCACHE_H */
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
setup_per_zone_pages_min-overflow-fix.patch
revert-vfs-propagate-mnt_flags-into-do_loopback-vfsmount.patch
jffs2-warning-fixes.patch
dl2k-build-fix.patch
git-acpi.patch
acpi-update-asus_acpi-driver-registration-fix.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch
catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch
acpi-dock-driver-interface-fixups.patch
remove-for_each_cpu.patch
sony_apci-resume.patch
uninorth-agp-warning-fixes.patch
alpha-agp-warning-fix.patch
powernow-k8-crash-workaround.patch
gregkh-driver-platform_bus-learns-about-modalias-warning-fix.patch
gregkh-driver-warn-when-statically-allocated-kobjects-are-used-fix.patch
s3c24xx-hardware-spi-driver-tidy.patch
git-dvb.patch
scx200_acb-use-pci-i-o-resource-when-appropriate-fix.patch
w1-warning-fix.patch
git-gfs2.patch
git-ieee1394.patch
git-infiniband.patch
via-pmu-add-input-device-tidy.patch
git-klibc.patch
git-klibc-alpha-fixes.patch
git-klibc-ident-fix.patch
git-klibc-build-hacks.patch
git-hdrcleanup-fixup.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-hdrinstall-fixup.patch
git-libata-all.patch
sdhci-truncated-pointer-fix.patch
git-mtd.patch
nand_base-modular-fix.patch
git-mtd-isnt-arm-only.patch
git-netdev-all.patch
git-netdev-all-e1000-fixup.patch
smc911x-Kconfig-fix.patch
pci-error-recovery-e1000-network-device-driver.patch
nfs-use-local-caching-fix.patch
git-powerpc.patch
powerpc-kbuild-warning-fix.patch
git-rbtree.patch
git-sas.patch
gregkh-pci-pci-64-bit-resources-drivers-others-changes-amba-fix.patch
kconfigurable-resources-core-changes-i386-fix.patch
kconfigurable-resources-core-changes-fix.patch
kconfigurable-resources-arch-dependent-changes-arch-a-i-fix.patch
typesh-sector_t-and-blkcnt_t-arent-for-userspace.patch
qla2xxx-lock-ordering-fix-warning-fix.patch
areca-raid-linux-scsi-driver-update6-for-2617-rc1-mm3-externs-go-in-headers.patch
git-watchdog.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86-fix.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86-fix-fix.patch
x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86_64-fix.patch
xfs-sparc32-build-fix.patch
pg_uncached-is-ia64-only.patch
pgdat-allocation-for-new-node-add-specify-node-id-powerpc-fix.patch
pgdat-allocation-for-new-node-add-specify-node-id-tidy.patch
pgdat-allocation-for-new-node-add-specify-node-id-fix-3.patch
pgdat-allocation-for-new-node-add-get-node-id-by-acpi-tidy.patch
pgdat-allocation-for-new-node-add-generic-alloc-node_data-tidy.patch
pgdat-allocation-for-new-node-add-refresh-node_data-fix.patch
pgdat-allocation-for-new-node-add-export-kswapd-start-func-tidy.patch
catch-valid-mem-range-at-onlining-memory-tidy.patch
catch-valid-mem-range-at-onlining-memory-fix.patch
mm-introduce-remap_vmalloc_range-fix.patch
tracking-dirty-pages-in-shared-mappings-v4-fix2.patch
tracking-dirty-pages-in-shared-mappings-v4-fix3.patch
throttle-writers-of-shared-mappings-tidy.patch
acx1xx-wireless-driver.patch
dont-use-flush_tlb_all-in-suspend-time-tidy.patch
prune_one_dentry-tweaks.patch
mmput-might-sleep.patch
jbd-avoid-kfree-null.patch
ext3_clear_inode-avoid-kfree-null.patch
leds-amstrad-delta-led-support-tidy.patch
percpu-counter-data-type-changes-to-suppport-fix.patch
connector-exports.patch
config_net=n-build-fix.patch
jbd-split-checkpoint-lists-tidy.patch
mark-address_space_operations-const-fix.patch
mark-address_space_operations-const-fix-2.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-fix.patch
allow-for-per-cpu-data-being-in-tdata-and-tbss-sections-tidy.patch
deprecate-smbfs-in-favour-of-cifs.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates.patch
hptiop-highpoint-rocketraid-3xxx-controller-driver-list-locking-updates-updates-2.patch
ufs-right-block-allocation-fixes.patch
sunsu-license-fix.patch
per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch
hangcheck-remove-monotomic_clock-on-x86.patch
pi-futex-futex-code-cleanups-fix.patch
document-futex-pi-design-fix-fix.patch
ecryptfs-main-module-functions-vs-nfs-permit-filesystem-to-override-root-dentry-on-mount.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
reiser4.patch
reiser4-vs-nfs-permit-filesystem-to-override-root-dentry-on-mount.patch
reiser4-vs-nfs-permit-filesystem-to-perform-statfs-with-a-known-root-dentry.patch
ide_dma_speed-fixes-warning-fix.patch
ide_dma_speed-fixes-tidy.patch
savagefb-add-state-save-and_restore-hooks-tidy.patch
kgdb-core-lite-add-reboot-command.patch
kgdb-8250-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
profile-likely-unlikely-macros-tidy.patch
profile-likely-unlikely-macros-fix.patch
profile-likely-unlikely-macros-fix-2.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
