Skip to content

Commit 8a05abd

Browse files
committed
Merge tag 'ceph-for-5.15-rc1' of git://github.com/ceph/ceph-client
Pull ceph updates from Ilya Dryomov: - a set of patches to address fsync stalls caused by depending on periodic rather than triggered MDS journal flushes in some cases (Xiubo Li) - a fix for mtime effectively not getting updated in case of competing writers (Jeff Layton) - a couple of fixes for inode reference leaks and various WARNs after "umount -f" (Xiubo Li) - a new ceph.auth_mds extended attribute (Jeff Layton) - a smattering of fixups and cleanups from Jeff, Xiubo and Colin. * tag 'ceph-for-5.15-rc1' of git://github.com/ceph/ceph-client: ceph: fix dereference of null pointer cf ceph: drop the mdsc_get_session/put_session dout messages ceph: lockdep annotations for try_nonblocking_invalidate ceph: don't WARN if we're forcibly removing the session caps ceph: don't WARN if we're force umounting ceph: remove the capsnaps when removing caps ceph: request Fw caps before updating the mtime in ceph_write_iter ceph: reconnect to the export targets on new mdsmaps ceph: print more information when we can't find snaprealm ceph: add ceph_change_snap_realm() helper ceph: remove redundant initializations from mdsc and session ceph: cancel delayed work instead of flushing on mdsc teardown ceph: add a new vxattr to return auth mds for an inode ceph: remove some defunct forward declarations ceph: flush the mdlog before waiting on unsafe reqs ceph: flush mdlog before umounting ceph: make iterate_sessions a global symbol ceph: make ceph_create_session_msg a global symbol ceph: fix comment about short copies in ceph_write_end ceph: fix memory leak on decode error in ceph_handle_caps
2 parents 34c59da + 05a444d commit 8a05abd

File tree

14 files changed

+438
-207
lines changed

14 files changed

+438
-207
lines changed

fs/ceph/addr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,8 +1281,8 @@ static int ceph_write_end(struct file *file, struct address_space *mapping,
12811281
dout("write_end file %p inode %p page %p %d~%d (%d)\n", file,
12821282
inode, page, (int)pos, (int)copied, (int)len);
12831283

1284-
/* zero the stale part of the page if we did a short copy */
12851284
if (!PageUptodate(page)) {
1285+
/* just return that nothing was copied on a short copy */
12861286
if (copied < len) {
12871287
copied = 0;
12881288
goto out;

fs/ceph/cache.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ void ceph_fscache_unregister_inode_cookie(struct ceph_inode_info* ci);
2626
void ceph_fscache_file_set_cookie(struct inode *inode, struct file *filp);
2727
void ceph_fscache_revalidate_cookie(struct ceph_inode_info *ci);
2828

29-
int ceph_readpage_from_fscache(struct inode *inode, struct page *page);
30-
int ceph_readpages_from_fscache(struct inode *inode,
31-
struct address_space *mapping,
32-
struct list_head *pages,
33-
unsigned *nr_pages);
34-
3529
static inline void ceph_fscache_inode_init(struct ceph_inode_info *ci)
3630
{
3731
ci->fscache = NULL;

0 commit comments

Comments
 (0)