leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] convert hugetlbfs_counter to atomic

Browse Source 
Implementation of hugetlbfs_counter() is functionally equivalent to
atomic_inc_return().  Use the simpler atomic form.

Signed-off-by: Ken Chen <kenneth.w.chen@intel.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Chen, Kenneth W 2006-03-22 00:09:02 -08:00 committed by Linus Torvalds
parent 42b88befd6
commit bba1e9b211
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/hugetlbfs/inode.c
View File

@ -737,21 +737,6 @@ static struct file_system_type hugetlbfs_fs_type = {
static struct vfsmount *hugetlbfs_vfsmount; static struct vfsmount *hugetlbfs_vfsmount;
/*
* Return the next identifier for a shm file
*/
static unsigned long hugetlbfs_counter(void)
{
static DEFINE_SPINLOCK(lock);
static unsigned long counter;
unsigned long ret;
spin_lock(&lock);
ret = ++counter;
spin_unlock(&lock);
return ret;
}
static int can_do_hugetlb_shm(void) static int can_do_hugetlb_shm(void)
{ {
return likely(capable(CAP_IPC_LOCK) || return likely(capable(CAP_IPC_LOCK) ||
@ -767,6 +752,7 @@ struct file *hugetlb_zero_setup(size_t size)
struct dentry *dentry, *root; struct dentry *dentry, *root;
struct qstr quick_string; struct qstr quick_string;
char buf[16]; char buf[16];
static atomic_t counter;
if (!can_do_hugetlb_shm()) if (!can_do_hugetlb_shm())
return ERR_PTR(-EPERM); return ERR_PTR(-EPERM);
@ -775,7 +761,7 @@ struct file *hugetlb_zero_setup(size_t size)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
root = hugetlbfs_vfsmount->mnt_root; root = hugetlbfs_vfsmount->mnt_root;
snprintf(buf, 16, "%lu", hugetlbfs_counter()); snprintf(buf, 16, "%u", atomic_inc_return(&counter));
quick_string.name = buf; quick_string.name = buf;
quick_string.len = strlen(quick_string.name); quick_string.len = strlen(quick_string.name);
quick_string.hash = 0; quick_string.hash = 0;