Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ecfcb26 authored by Al Viro's avatar Al Viro
Browse files

orangefs: don't open-code inode_lock/inode_unlock 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 7b9743eb

fs/orangefs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -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(&file->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(&file->f_mapping->host->i_mutex);

	inode_unlock(file->f_mapping->host);

	return rc;

}

fs/orangefs/orangefs-kernel.h

+2 −2
Original line number Diff line number Diff line
@@ -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(&inode->i_mutex);

	inode_lock(inode);

#endif

	i_size_write(inode, i_size);

#if BITS_PER_LONG == 32 && defined(CONFIG_SMP)

	mutex_unlock(&inode->i_mutex);

	inode_unlock(inode);

#endif

}