Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / smbfs / symlink.c

diff --git a/fs/smbfs/symlink.c b/fs/smbfs/symlink.c
deleted file mode 100644 (file)
index 00b2909..0000000
--- a/fs/smbfs/symlink.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  symlink.c
- *
- *  Copyright (C) 2002 by John Newbigin
- *
- *  Please add a note about your changes to smbfs in the ChangeLog file.
- */
-
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/fcntl.h>
-#include <linux/stat.h>
-#include <linux/mm.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-#include <linux/net.h>
-#include <linux/namei.h>
-
-#include <asm/uaccess.h>
-#include <asm/system.h>
-
-#include <linux/smbno.h>
-#include <linux/smb_fs.h>
-
-#include "smb_debug.h"
-#include "proto.h"
-
-int smb_symlink(struct inode *inode, struct dentry *dentry, const char *oldname)
-{
-       DEBUG1("create symlink %s -> %s/%s\n", oldname, DENTRY_PATH(dentry));
-
-       return smb_proc_symlink(server_from_dentry(dentry), dentry, oldname);
-}
-
-static void *smb_follow_link(struct dentry *dentry, struct nameidata *nd)
-{
-       char *link = __getname();
-       DEBUG1("followlink of %s/%s\n", DENTRY_PATH(dentry));
-
-       if (!link) {
-               link = ERR_PTR(-ENOMEM);
-       } else {
-               int len = smb_proc_read_link(server_from_dentry(dentry),
-                                               dentry, link, PATH_MAX - 1);
-               if (len < 0) {
-                       __putname(link);
-                       link = ERR_PTR(len);
-               } else {
-                       link[len] = 0;
-               }
-       }
-       nd_set_link(nd, link);
-       return NULL;
-}
-
-static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
-{
-       char *s = nd_get_link(nd);
-       if (!IS_ERR(s))
-               __putname(s);
-}
-
-const struct inode_operations smb_link_inode_operations =
-{
-       .readlink       = generic_readlink,
-       .follow_link    = smb_follow_link,
-       .put_link       = smb_put_link,
-};