diff options
| author | Linus Torvalds | 2019-07-16 15:15:29 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-16 15:15:29 -0700 |
| commit | 0a8ad0ffa4d80a544f6cbff703bf6394339afcdf (patch) | |
| tree | 79558167c6e8c5c059a54625c3be5395b95adcaa /fs/orangefs | |
| parent | a18f8775419d3df282dd83efdb51c5a64d092f31 (diff) | |
| parent | e65682b55956e9fbf8a88f303a48e7c1430ffe15 (diff) | |
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
Diffstat (limited to 'fs/orangefs')
| -rw-r--r-- | fs/orangefs/file.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c index 679a3c8e4fb3..960f9a3c012d 100644 --- a/fs/orangefs/file.c +++ b/fs/orangefs/file.c @@ -52,7 +52,7 @@ ssize_t wait_for_direct_io(enum ORANGEFS_io_type type, struct inode *inode, struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode); struct orangefs_khandle *handle = &orangefs_inode->refn.khandle; struct orangefs_kernel_op_s *new_op = NULL; - int buffer_index = -1; + int buffer_index; ssize_t ret; size_t copy_amount; @@ -134,7 +134,6 @@ populate_shared_memory: */ if (ret == -EAGAIN && op_state_purged(new_op)) { orangefs_bufmap_put(buffer_index); - buffer_index = -1; if (type == ORANGEFS_IO_WRITE) iov_iter_revert(iter, total_size); gossip_debug(GOSSIP_FILE_DEBUG, @@ -262,7 +261,6 @@ out: "%s(%pU): PUT buffer_index %d\n", __func__, handle, buffer_index); } - buffer_index = -1; } op_release(new_op); return ret; |