The patch titled nfs: remove nfs_put_link() has been added to the -mm tree. Its filename is nfs-remove-nfs_put_link.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: nfs: remove nfs_put_link() From: Alexey Dobriyan <adobriyan@xxxxxxxxx> Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/nfs/symlink.c | 11 +---------- 1 files changed, 1 insertion(+), 10 deletions(-) diff -puN fs/nfs/symlink.c~nfs-remove-nfs_put_link fs/nfs/symlink.c --- 25/fs/nfs/symlink.c~nfs-remove-nfs_put_link Tue Jun 20 17:00:52 2006 +++ 25-akpm/fs/nfs/symlink.c Tue Jun 20 17:00:52 2006 @@ -75,22 +75,13 @@ read_failed: return NULL; } -static void nfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) -{ - if (cookie) { - struct page *page = cookie; - kunmap(page); - page_cache_release(page); - } -} - /* * symlinks can't do much... */ struct inode_operations nfs_symlink_inode_operations = { .readlink = generic_readlink, .follow_link = nfs_follow_link, - .put_link = nfs_put_link, + .put_link = page_put_link, .getattr = nfs_getattr, .setattr = nfs_setattr, }; _ Patches currently in -mm which might be from adobriyan@xxxxxxxxx are origin.patch git-acpi.patch git-block.patch git-ieee1394.patch git-libata-all.patch git-mtd.patch git-nfs.patch nfs-remove-nfs_put_link.patch xfs-remove-dir-check-in-xfs_link.patch xfs-use-container_of-in-vn_from_inode.patch xfs-pass-inode-to-xfs_ioc_space.patch xfs-remove-unused-behaviour-lock.patch x86-dont-trigger-full-rebuild-via-config_mtrr.patch dont-trigger-full-rebuild-via-config_x86_mce.patch remove-config_parport_arc-drivers-parport-parport_arcc.patch two-additions-to-linux-documentation-ioctl-numbertxt.patch more-bug_on-conversion.patch emu10k1-mark-midi_spinlock-as-used.patch nbd-endian-annotations.patch documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.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