Page MenuHomeFreeBSD
Files F131553122

D29031.id85036.diff
No OneTemporary
Actions

D29031.id85036.diff
View Options

Index: sys/fs/fuse/fuse_vnops.c
===================================================================
--- sys/fs/fuse/fuse_vnops.c
+++ sys/fs/fuse/fuse_vnops.c
@@ -437,10 +437,14 @@
op = FUSE_GETLK;
break;
case F_SETLK:
- op = FUSE_SETLK;
+ if (flags & F_WAIT)
+ op = FUSE_SETLKW;
+ else
+ op = FUSE_SETLK;
break;
- case F_SETLKW:
- op = FUSE_SETLKW;
+ case F_UNLCK:
+ op = FUSE_SETLK;
+ flags |= F_UNLCK;
break;
default:
return EINVAL;
Index: tests/sys/fs/fusefs/flush.cc
===================================================================
--- tests/sys/fs/fusefs/flush.cc
+++ tests/sys/fs/fusefs/flush.cc
@@ -210,6 +210,16 @@
ResultOf([=](auto in) {
return (in.header.opcode == FUSE_SETLK &&
in.header.nodeid == ino &&
+ in.body.setlk.lk.type == F_RDLCK &&
+ in.body.setlk.fh == FH);
+ }, Eq(true)),
+ _)
+ ).WillOnce(Invoke(ReturnErrno(0)));
+ EXPECT_CALL(*m_mock, process(
+ ResultOf([=](auto in) {
+ return (in.header.opcode == FUSE_SETLK &&
+ in.header.nodeid == ino &&
+ in.body.setlk.lk.type == F_UNLCK &&
in.body.setlk.fh == FH);
}, Eq(true)),
_)
@@ -224,7 +234,7 @@
fl.l_type = F_RDLCK;
fl.l_whence = SEEK_SET;
fl.l_sysid = 0;
- ASSERT_NE(-1, fcntl(fd, F_SETLKW, &fl)) << strerror(errno);
+ ASSERT_NE(-1, fcntl(fd, F_SETLK, &fl)) << strerror(errno);
fd2 = open(FULLPATH, O_WRONLY);
ASSERT_LE(0, fd2) << strerror(errno);
Index: tests/sys/fs/fusefs/locks.cc
===================================================================
--- tests/sys/fs/fusefs/locks.cc
+++ tests/sys/fs/fusefs/locks.cc
@@ -72,6 +72,23 @@
return (in.header.opcode == FUSE_SETLK &&
in.header.nodeid == ino &&
in.body.setlk.fh == FH &&
+ in.body.setlk.owner == (uint32_t)pid &&
+ in.body.setlk.lk.start == start &&
+ in.body.setlk.lk.end == end &&
+ in.body.setlk.lk.type == type &&
+ in.body.setlk.lk.pid == (uint64_t)pid);
+ }, Eq(true)),
+ _)
+ ).WillOnce(Invoke(ReturnErrno(err)));
+}
+void expect_setlkw(uint64_t ino, pid_t pid, uint64_t start, uint64_t end,
+ uint32_t type, int err)
+{
+ EXPECT_CALL(*m_mock, process(
+ ResultOf([=](auto in) {
+ return (in.header.opcode == FUSE_SETLKW &&
+ in.header.nodeid == ino &&
+ in.body.setlkw.fh == FH &&
in.body.setlkw.owner == (uint32_t)pid &&
in.body.setlkw.lk.start == start &&
in.body.setlkw.lk.end == end &&
@@ -343,6 +360,32 @@
leak(fd);
}
+/* Clear a lock with FUSE_SETLK */
+TEST_F(Setlk, clear)
+{
+ const char FULLPATH[] = "mountpoint/some_file.txt";
+ const char RELPATH[] = "some_file.txt";
+ uint64_t ino = 42;
+ struct flock fl;
+ int fd;
+ pid_t pid = 1234;
+
+ expect_lookup(RELPATH, ino);
+ expect_open(ino, 0, 1);
+ expect_setlk(ino, pid, 10, 1009, F_UNLCK, 0);
+
+ fd = open(FULLPATH, O_RDWR);
+ ASSERT_LE(0, fd) << strerror(errno);
+ fl.l_start = 10;
+ fl.l_len = 1000;
+ fl.l_pid = pid;
+ fl.l_type = F_UNLCK;
+ fl.l_whence = SEEK_SET;
+ fl.l_sysid = 0;
+ ASSERT_NE(-1, fcntl(fd, F_SETLK, &fl)) << strerror(errno);
+ leak(fd);
+}
+
/* Set a new lock with FUSE_SETLK */
TEST_F(Setlk, set)
{
@@ -465,7 +508,7 @@
expect_lookup(RELPATH, ino);
expect_open(ino, 0, 1);
- expect_setlk(ino, pid, 10, 1009, F_RDLCK, 0);
+ expect_setlkw(ino, pid, 10, 1009, F_RDLCK, 0);
fd = open(FULLPATH, O_RDWR);
ASSERT_LE(0, fd) << strerror(errno);
Index: tests/sys/fs/fusefs/release.cc
===================================================================
--- tests/sys/fs/fusefs/release.cc
+++ tests/sys/fs/fusefs/release.cc
@@ -206,6 +206,16 @@
ResultOf([=](auto in) {
return (in.header.opcode == FUSE_SETLK &&
in.header.nodeid == ino &&
+ in.body.setlk.lk.type == F_RDLCK &&
+ in.body.setlk.fh == FH);
+ }, Eq(true)),
+ _)
+ ).WillOnce(Invoke(ReturnErrno(0)));
+ EXPECT_CALL(*m_mock, process(
+ ResultOf([=](auto in) {
+ return (in.header.opcode == FUSE_SETLK &&
+ in.header.nodeid == ino &&
+ in.body.setlk.lk.type == F_UNLCK &&
in.body.setlk.fh == FH);
}, Eq(true)),
_)
@@ -221,7 +231,7 @@
fl.l_type = F_RDLCK;
fl.l_whence = SEEK_SET;
fl.l_sysid = 0;
- ASSERT_NE(-1, fcntl(fd, F_SETLKW, &fl)) << strerror(errno);
+ ASSERT_NE(-1, fcntl(fd, F_SETLK, &fl)) << strerror(errno);
ASSERT_EQ(0, close(fd)) << strerror(errno);
}

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 10, 5:04 AM (19 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23519547
Default Alt Text
D29031.id85036.diff (4 KB)

Event Timeline