Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'for-linus-5.3-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux

Pull orangefs updates from Mike Marshall:
"Two small fixes.

This is just a fix for an unused value that Colin King sent me and a
related fix I added"

* tag 'for-linus-5.3-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
orangefs: eliminate needless variable assignments
orangefs: remove redundant assignment to variable buffer_index

+1 -3
+1 -3
fs/orangefs/file.c
··· 52 52 struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode); 53 53 struct orangefs_khandle *handle = &orangefs_inode->refn.khandle; 54 54 struct orangefs_kernel_op_s *new_op = NULL; 55 - int buffer_index = -1; 55 + int buffer_index; 56 56 ssize_t ret; 57 57 size_t copy_amount; 58 58 ··· 134 134 */ 135 135 if (ret == -EAGAIN && op_state_purged(new_op)) { 136 136 orangefs_bufmap_put(buffer_index); 137 - buffer_index = -1; 138 137 if (type == ORANGEFS_IO_WRITE) 139 138 iov_iter_revert(iter, total_size); 140 139 gossip_debug(GOSSIP_FILE_DEBUG, ··· 261 262 "%s(%pU): PUT buffer_index %d\n", 262 263 __func__, handle, buffer_index); 263 264 } 264 - buffer_index = -1; 265 265 } 266 266 op_release(new_op); 267 267 return ret;