summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Brandenburg <martin@omnibond.com>2016-03-14 16:59:38 -0400
committerMike Marshall <hubcap@omnibond.com>2016-03-23 17:36:13 -0400
commitd57521a653e7ac2e8edaabfff202caf87c61f08a (patch)
treea7bddb5f886c9e426b7da1a75af617893f3a5b50
parent2f83ace37181e445cab83d1d2a3a1dc88a36a814 (diff)
orangefs: remove inode->i_lock wrapper
Signed-off-by: Martin Brandenburg <martin@omnibond.com> Signed-off-by: Mike Marshall <hubcap@omnibond.com>
-rw-r--r--fs/orangefs/orangefs-kernel.h3
-rw-r--r--fs/orangefs/orangefs-utils.c8
2 files changed, 4 insertions, 7 deletions
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index 045e493ab033..784629870717 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -632,9 +632,6 @@ do { \
spin_unlock(&orangefs_superblocks_lock); \
} 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) \
do { \
sys_attr.owner = from_kuid(current_user_ns(), current_fsuid()); \
diff --git a/fs/orangefs/orangefs-utils.c b/fs/orangefs/orangefs-utils.c
index 8ef9e9646748..df4ad04407e2 100644
--- a/fs/orangefs/orangefs-utils.c
+++ b/fs/orangefs/orangefs-utils.c
@@ -170,11 +170,11 @@ static int copy_attributes_to_inode(struct inode *inode,
rounded_up_size =
(inode_size + (4096 - (inode_size % 4096)));
- orangefs_lock_inode(inode);
+ spin_lock(&inode->i_lock);
inode->i_bytes = inode_size;
inode->i_blocks =
(unsigned long)(rounded_up_size / 512);
- orangefs_unlock_inode(inode);
+ spin_unlock(&inode->i_lock);
/*
* NOTE: make sure all the places we're called
@@ -194,9 +194,9 @@ static int copy_attributes_to_inode(struct inode *inode,
default:
inode->i_size = PAGE_CACHE_SIZE;
- orangefs_lock_inode(inode);
+ spin_lock(&inode->i_lock);
inode_set_bytes(inode, inode->i_size);
- orangefs_unlock_inode(inode);
+ spin_unlock(&inode->i_lock);
break;
}