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

orangefs: remove inode->i_lock wrapper

Browse Source 
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
This commit is contained in:
Martin Brandenburg
2016-03-14 16:59:38 -04:00
committed by Mike Marshall
parent 2f83ace371
commit d57521a653
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/orangefs/orangefs-kernel.h
View File

@@ -632,9 +632,6 @@ do { \
spin_unlock(&orangefs_superblocks_lock); \ spin_unlock(&orangefs_superblocks_lock); \
} while (0) } while (0)
#define orangefs_lock_inode(inode) spin_lock(&inode->i_lock)
#define orangefs_unlock_inode(inode) spin_unlock(&inode->i_lock)
#define fill_default_sys_attrs(sys_attr, type, mode) \ #define fill_default_sys_attrs(sys_attr, type, mode) \
do { \ do { \
sys_attr.owner = from_kuid(current_user_ns(), current_fsuid()); \ sys_attr.owner = from_kuid(current_user_ns(), current_fsuid()); \

8
fs/orangefs/orangefs-utils.c
View File

@@ -170,11 +170,11 @@ static int copy_attributes_to_inode(struct inode *inode,
rounded_up_size = rounded_up_size =
(inode_size + (4096 - (inode_size % 4096))); (inode_size + (4096 - (inode_size % 4096)));
orangefs_lock_inode(inode); spin_lock(&inode->i_lock);
inode->i_bytes = inode_size; inode->i_bytes = inode_size;
inode->i_blocks = inode->i_blocks =
(unsigned long)(rounded_up_size / 512); (unsigned long)(rounded_up_size / 512);
orangefs_unlock_inode(inode); spin_unlock(&inode->i_lock);
/* /*
* NOTE: make sure all the places we're called * NOTE: make sure all the places we're called
@@ -194,9 +194,9 @@ static int copy_attributes_to_inode(struct inode *inode,
default: default:
inode->i_size = PAGE_CACHE_SIZE; inode->i_size = PAGE_CACHE_SIZE;
orangefs_lock_inode(inode); spin_lock(&inode->i_lock);
inode_set_bytes(inode, inode->i_size); inode_set_bytes(inode, inode->i_size);
orangefs_unlock_inode(inode); spin_unlock(&inode->i_lock);
break; break;
} }