RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #40204 into master

Browse Source 
* refs/pull/40204/head:
	client: cleanup _preadv_pwritev_locked()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
This commit is contained in:
Patrick Donnelly 2021-04-07 19:37:40 -07:00
commit dd2e31a336
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/client/Client.cc
View File

@ -10006,9 +10006,11 @@ int Client::pwritev(int fd, const struct iovec *iov, int iovcnt, int64_t offset)
}
int64_t Client::_preadv_pwritev_locked(Fh *fh, const struct iovec *iov,
unsigned iovcnt, int64_t offset, bool write,
bool clamp_to_int, std::unique_lock<ceph::mutex> &cl)
unsigned iovcnt, int64_t offset,
bool write, bool clamp_to_int)
{
ceph_assert(ceph_mutex_is_locked_by_me(client_lock));
#if defined(__linux__) && defined(O_PATH)
if (fh->flags & O_PATH)
return -CEPHFS_EBADF;
@ -10037,7 +10039,7 @@ int64_t Client::_preadv_pwritev_locked(Fh *fh, const struct iovec *iov,
if (r <= 0)
return r;
cl.unlock();
client_lock.unlock();
auto iter = bl.cbegin();
for (unsigned j = 0, resid = r; j < iovcnt && resid > 0; j++) {
/*
@ -10049,7 +10051,7 @@ int64_t Client::_preadv_pwritev_locked(Fh *fh, const struct iovec *iov,
resid -= round_size;
/* iter is self-updating */
}
cl.lock();
client_lock.lock();
return r;
}
}
@ -10063,11 +10065,11 @@ int Client::_preadv_pwritev(int fd, const struct iovec *iov, unsigned iovcnt, in
tout(cct) << fd << std::endl;
tout(cct) << offset << std::endl;
std::unique_lock cl(client_lock);
std::scoped_lock cl(client_lock);
Fh *fh = get_filehandle(fd);
if (!fh)
return -CEPHFS_EBADF;
return _preadv_pwritev_locked(fh, iov, iovcnt, offset, write, true, cl);
return _preadv_pwritev_locked(fh, iov, iovcnt, offset, write, true);
}
int64_t Client::_write(Fh *f, int64_t offset, uint64_t size, const char *buf,
@ -14145,8 +14147,8 @@ int64_t Client::ll_writev(struct Fh *fh, const struct iovec *iov, int iovcnt, in
if (!mref_reader.is_state_satisfied())
return -CEPHFS_ENOTCONN;
std::unique_lock cl(client_lock);
return _preadv_pwritev_locked(fh, iov, iovcnt, off, true, false, cl);
std::scoped_lock cl(client_lock);
return _preadv_pwritev_locked(fh, iov, iovcnt, off, true, false);
}
int64_t Client::ll_readv(struct Fh *fh, const struct iovec *iov, int iovcnt, int64_t off)
@ -14155,8 +14157,8 @@ int64_t Client::ll_readv(struct Fh *fh, const struct iovec *iov, int iovcnt, int
if (!mref_reader.is_state_satisfied())
return -CEPHFS_ENOTCONN;
std::unique_lock cl(client_lock);
return _preadv_pwritev_locked(fh, iov, iovcnt, off, false, false, cl);
std::scoped_lock cl(client_lock);
return _preadv_pwritev_locked(fh, iov, iovcnt, off, false, false);
}
int Client::ll_flush(Fh *fh)

6
src/client/Client.h
View File

@ -1319,9 +1319,9 @@ private:
const struct iovec *iov, int iovcnt);
int64_t _preadv_pwritev_locked(Fh *fh, const struct iovec *iov,
unsigned iovcnt, int64_t offset,
bool write, bool clamp_to_int,
std::unique_lock<ceph::mutex> &cl);
int _preadv_pwritev(int fd, const struct iovec *iov, unsigned iovcnt, int64_t offset, bool write);
bool write, bool clamp_to_int);
int _preadv_pwritev(int fd, const struct iovec *iov, unsigned iovcnt,
int64_t offset, bool write);
int _flush(Fh *fh);
int _fsync(Fh *fh, bool syncdataonly);
int _fsync(Inode *in, bool syncdataonly);