Skip to content

Commit 3053888

Browse files
committed
switch to ubuntu 22.04
1 parent 058dbe1 commit 3053888

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/actions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push]
44

55
jobs:
66
Linux:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-22.04
88
steps:
99
- name: Creating contiguous...
1010
uses: ncipollo/release-action@v1
@@ -30,7 +30,7 @@ jobs:
3030
- name: Install Dependencies...
3131
run: |
3232
sudo apt-get update
33-
sudo apt-get -y install qt5-default qttools5-dev qttools5-dev-tools libgtk2.0-dev libfuse-dev libmagic-dev libtag1-dev libssl-dev ninja-build cmake
33+
sudo apt-get -y install qtbase5-dev qt5-qmake qttools5-dev qttools5-dev-tools libgtk2.0-dev libfuse3-dev libfuse2 libmagic-dev libtag1-dev libssl-dev ninja-build cmake
3434
- name: Checking out sources...
3535
uses: actions/checkout@v4
3636
- name: Configuring...

fuse/fuse.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -823,14 +823,14 @@ namespace
823823
void Init (void *userdata, struct fuse_conn_info *conn)
824824
{
825825
mtp::debug("Init: fuse proto version: ", conn->proto_major, ".", conn->proto_minor,
826-
", capability: 0x", mtp::hex(conn->capable_ext, 8),
826+
", capability: 0x", mtp::hex(conn->capable, 8),
827827
", max readahead: ", conn->max_readahead, ", max write: ", conn->max_write
828828
);
829829

830830
//If synchronous reads are chosen, Fuse will wait for reads to complete before issuing any other requests.
831831
//mtp is completely synchronous. you cannot have two transaction in parallel, so you have to wait any operation to finish before starting another one
832832

833-
fuse_unset_feature_flag(conn, FUSE_CAP_ASYNC_READ);
833+
conn->want &= ~FUSE_CAP_ASYNC_READ;
834834
try { g_wrapper->Init(userdata, conn); } catch (const std::exception &ex) { mtp::error("init failed:", ex.what()); }
835835
}
836836

0 commit comments

Comments
 (0)