From 3dc6d4be1b469b09bff0ec08c90ef9fd0500b309 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 11 Jun 2008 15:44:22 -0400 Subject: [PATCH] --- yaml --- r: 101971 b: refs/heads/master c: 76566991f94c206d9c5881edcaf99ba72c9e9d61 h: refs/heads/master i: 101969: 7c77e5bfa058957ae9280f8538fd8e8b7bcb056c 101967: 6e75f09dc75aedb2211ff5aebc09ce1c60340924 v: v3 --- [refs] | 2 +- trunk/fs/nfs/dir.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index cd5561ca415e..9e33d932f227 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52e2e8d37e01edf38ccdccc983fb13ec1456d63d +refs/heads/master: 76566991f94c206d9c5881edcaf99ba72c9e9d61 diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c index 1bdc36bf1782..e5f950291928 100644 --- a/trunk/fs/nfs/dir.c +++ b/trunk/fs/nfs/dir.c @@ -1482,13 +1482,9 @@ static int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *sym attr.ia_mode = S_IFLNK | S_IRWXUGO; attr.ia_valid = ATTR_MODE; - lock_kernel(); - page = alloc_page(GFP_HIGHUSER); - if (!page) { - unlock_kernel(); + if (!page) return -ENOMEM; - } kaddr = kmap_atomic(page, KM_USER0); memcpy(kaddr, symname, pathlen); @@ -1503,7 +1499,6 @@ static int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *sym dentry->d_name.name, symname, error); d_drop(dentry); __free_page(page); - unlock_kernel(); return error; } @@ -1521,7 +1516,6 @@ static int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *sym } else __free_page(page); - unlock_kernel(); return 0; }