The patch titled
NFS: move nfs_copy_user_string
has been removed from the -mm tree. Its filename was
nfs-move-nfs_copy_user_string.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: NFS: move nfs_copy_user_string
From: Chuck Lever <chuck.lever@xxxxxxxxxx>
Next patch will add a new function that calls nfs_copy_user_string.
Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nfs/super.c | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff -puN fs/nfs/super.c~nfs-move-nfs_copy_user_string fs/nfs/super.c
--- a/fs/nfs/super.c~nfs-move-nfs_copy_user_string
+++ a/fs/nfs/super.c
@@ -1670,6 +1670,27 @@ out_err:
return ERR_PTR(-EINVAL);
}
+static void *nfs_copy_user_string(char *dst, struct nfs_string *src, int maxlen)
+{
+ void *p = NULL;
+
+ if (!src->len)
+ return ERR_PTR(-EINVAL);
+ if (src->len < maxlen)
+ maxlen = src->len;
+ if (dst == NULL) {
+ p = dst = kmalloc(maxlen + 1, GFP_KERNEL);
+ if (p == NULL)
+ return ERR_PTR(-ENOMEM);
+ }
+ if (copy_from_user(dst, src->data, maxlen)) {
+ kfree(p);
+ return ERR_PTR(-EFAULT);
+ }
+ dst[maxlen] = '\0';
+ return dst;
+}
+
/*
* Finish setting up a cloned NFS4 superblock
*/
@@ -1694,27 +1715,6 @@ static void nfs4_fill_super(struct super
nfs_initialise_sb(sb);
}
-static void *nfs_copy_user_string(char *dst, struct nfs_string *src, int maxlen)
-{
- void *p = NULL;
-
- if (!src->len)
- return ERR_PTR(-EINVAL);
- if (src->len < maxlen)
- maxlen = src->len;
- if (dst == NULL) {
- p = dst = kmalloc(maxlen + 1, GFP_KERNEL);
- if (p == NULL)
- return ERR_PTR(-ENOMEM);
- }
- if (copy_from_user(dst, src->data, maxlen)) {
- kfree(p);
- return ERR_PTR(-EFAULT);
- }
- dst[maxlen] = '\0';
- return dst;
-}
-
/*
* Get the superblock for an NFS4 mountpoint
*/
_
Patches currently in -mm which might be from chuck.lever@xxxxxxxxxx are
git-nfs.patch
nfs-refactor-ip-address-sanity-checks-in-nfs-client.patch
nfs-move-nfs_copy_user_string.patch
nfs-more-nfs4-in-kernel-mount-option-parsing-infrastructure.patch
nfs-integrate-support-for-processing-nfs4-mount-options-in-fs-nfs-superc.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
