The patch titled

     v9fs: adjust follow_link and put_link to match new VFS API

has been added to the -mm tree.  Its filename is

     v9fs-vfs-inode-operations-adjust-follow_link-and-put_link-to.patch

Patches currently in -mm which might be from [EMAIL PROTECTED] are

v9fs-documentation-makefiles-configuration.patch
v9fs-documentation-makefiles-configuration-add-fd-based-transport-to-makefile-docs.patch
v9fs-vfs-file-dentry-and-directory-operations.patch
v9fs-vfs-inode-operations.patch
v9fs-vfs-inode-operations-adjust-follow_link-and-put_link-to.patch
v9fs-vfs-superblock-operations-and-glue.patch
v9fs-vfs-superblock-operations-and-glue-add-fd-based-transport-to-mount-options.patch
v9fs-9p-protocol-implementation.patch
v9fs-9p-protocol-implementation-use-standard-kernel-byteswapping.patch
v9fs-transport-modules.patch
v9fs-transport-modules-add-fd-based-transport-module.patch
v9fs-transport-modules-fix-a-problem-with-named-pipe-transport.patch
v9fs-debug-and-support-routines.patch
v9fs-change-error-magic-numbers-to-defined-constants.patch
v9fs-clean-up-vfs_inode-and-setattr-functions.patch
v9fs-fix-support-for-special-files-devices-named-pipes-etc.patch
v9fs-readlink-extended-mode-check.patch
v9fs-fix-handling-of-malformed-9p-messages.patch
v9fs-fix-plan9port-example-in-v9fs.patch
v9fs-remove-sparse-bitwise-warnings.patch



From: Eric Van Hensbergen <[EMAIL PROTECTED]>

In 2.6.13-rc7 the prototypes for follow_link and put_link were changed to
include support for a cookie to help reclaim resources.  This patch adjusts
their definitions in the v9fs implementation.

Signed-off-by: Eric Van Hensbergen <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 fs/9p/vfs_inode.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -puN 
fs/9p/vfs_inode.c~v9fs-vfs-inode-operations-adjust-follow_link-and-put_link-to 
fs/9p/vfs_inode.c
--- 
devel/fs/9p/vfs_inode.c~v9fs-vfs-inode-operations-adjust-follow_link-and-put_link-to
        2005-08-29 22:25:11.000000000 -0700
+++ devel-akpm/fs/9p/vfs_inode.c        2005-08-29 22:25:11.000000000 -0700
@@ -1136,7 +1136,7 @@ static int v9fs_vfs_readlink(struct dent
  *
  */
 
-static int v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
        int len = 0;
        char *link = __getname();
@@ -1156,7 +1156,7 @@ static int v9fs_vfs_follow_link(struct d
        }
        nd_set_link(nd, link);
 
-       return 0;
+       return NULL;
 }
 
 /**
@@ -1166,7 +1166,7 @@ static int v9fs_vfs_follow_link(struct d
  *
  */
 
-static void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd)
+static void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, 
void *p)
 {
        char *s = nd_get_link(nd);
 
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to