diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-14 11:16:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-14 11:16:33 -0800 |
| commit | 6f1f5caed5bfadd1cc8bdb0563eb8874dc3573ca (patch) | |
| tree | 6348e1334a647fc7e0c6e63397a455e60dbbea19 /fs/orangefs/inode.c | |
| parent | cfb3162495fe5b8702cf3854995508ef78a3f962 (diff) | |
| parent | 31720a2b109b3080eb77e97b8f6f50a27b4ae599 (diff) | |
Merge tag 'for-linus-6.2-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs updates from Mike Marshall:
- fix problems with memory leaks on exit in sysfs and debufs (Zhang)
- remove an unused variable and an unneeded assignment (Colin)
* tag 'for-linus-6.2-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()
orangefs: Fix kmemleak in orangefs_sysfs_init()
orangefs: Fix kmemleak in orangefs_prepare_debugfs_help_string()
orangefs: Fix sysfs not cleanup when dev init failed
orangefs: remove redundant assignment to variable buffer_index
orangefs: remove variable i
Diffstat (limited to 'fs/orangefs/inode.c')
| -rw-r--r-- | fs/orangefs/inode.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c index 370bd3bbf5e4..4df560894386 100644 --- a/fs/orangefs/inode.c +++ b/fs/orangefs/inode.c @@ -530,7 +530,6 @@ static ssize_t orangefs_direct_IO(struct kiocb *iocb, size_t count = iov_iter_count(iter); ssize_t total_count = 0; ssize_t ret = -EINVAL; - int i = 0; gossip_debug(GOSSIP_FILE_DEBUG, "%s-BEGIN(%pU): count(%d) after estimate_max_iovecs.\n", @@ -556,7 +555,6 @@ static ssize_t orangefs_direct_IO(struct kiocb *iocb, while (iov_iter_count(iter)) { size_t each_count = iov_iter_count(iter); size_t amt_complete; - i++; /* how much to transfer in this loop iteration */ if (each_count > orangefs_bufmap_size_query()) |