Commit 76566991 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Remove BKL from the symlink code 



Page cache accesses are serialised using page locks, whereas attribute
updates are serialised using inode->i_lock.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 52e2e8d3

fs/nfs/dir.c

+1 −7
Original line number Diff line number Diff line
@@ -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;

}