[PATCH 05/15] orangefs: don't open-code inode_lock/inode_unlock

[Al Viro]

From: Al Viro 

Signed-off-by: Al Viro 
---
 fs/orangefs/file.c| 4 ++--
 fs/orangefs/orangefs-kernel.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index ae92795..491e82c 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -445,7 +445,7 @@ static ssize_t orangefs_file_write_iter(struct kiocb *iocb, 
struct iov_iter *ite
 
gossip_debug(GOSSIP_FILE_DEBUG, "orangefs_file_write_iter\n");
 
-   mutex_lock(>f_mapping->host->i_mutex);
+   inode_lock(file->f_mapping->host);
 
/* Make sure generic_write_checks sees an up to date inode size. */
if (file->f_flags & O_APPEND) {
@@ -492,7 +492,7 @@ static ssize_t orangefs_file_write_iter(struct kiocb *iocb, 
struct iov_iter *ite
 
 out:
 
-   mutex_unlock(>f_mapping->host->i_mutex);
+   inode_unlock(file->f_mapping->host);
return rc;
 }
 
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index a9925e2..2281882 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -612,11 +612,11 @@ do {  
\
 static inline void orangefs_i_size_write(struct inode *inode, loff_t i_size)
 {
 #if BITS_PER_LONG == 32 && defined(CONFIG_SMP)
-   mutex_lock(>i_mutex);
+   inode_lock(inode);
 #endif
i_size_write(inode, i_size);
 #if BITS_PER_LONG == 32 && defined(CONFIG_SMP)
-   mutex_unlock(>i_mutex);
+   inode_unlock(inode);
 #endif
 }
 
-- 
2.8.0.rc3

[PATCH 05/15] orangefs: don't open-code inode_lock/inode_unlock

[Al Viro]

From: Al Viro 

Signed-off-by: Al Viro 
---
 fs/orangefs/file.c| 4 ++--
 fs/orangefs/orangefs-kernel.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index ae92795..491e82c 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -445,7 +445,7 @@ static ssize_t orangefs_file_write_iter(struct kiocb *iocb, 
struct iov_iter *ite
 
gossip_debug(GOSSIP_FILE_DEBUG, "orangefs_file_write_iter\n");
 
-   mutex_lock(>f_mapping->host->i_mutex);
+   inode_lock(file->f_mapping->host);
 
/* Make sure generic_write_checks sees an up to date inode size. */
if (file->f_flags & O_APPEND) {
@@ -492,7 +492,7 @@ static ssize_t orangefs_file_write_iter(struct kiocb *iocb, 
struct iov_iter *ite
 
 out:
 
-   mutex_unlock(>f_mapping->host->i_mutex);
+   inode_unlock(file->f_mapping->host);
return rc;
 }
 
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index a9925e2..2281882 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -612,11 +612,11 @@ do {  
\
 static inline void orangefs_i_size_write(struct inode *inode, loff_t i_size)
 {
 #if BITS_PER_LONG == 32 && defined(CONFIG_SMP)
-   mutex_lock(>i_mutex);
+   inode_lock(inode);
 #endif
i_size_write(inode, i_size);
 #if BITS_PER_LONG == 32 && defined(CONFIG_SMP)
-   mutex_unlock(>i_mutex);
+   inode_unlock(inode);
 #endif
 }
 
-- 
2.8.0.rc3