diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-21 09:43:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-21 09:43:37 -0800 |
| commit | 8a61716ff2ab23eddd1f7a05a075a374e4d0c3d4 (patch) | |
| tree | f9534a62abcc72668a934948206bc1446afc44a8 /fs | |
| parent | d6622d913a637bce224f74425a9dfe734f946358 (diff) | |
| parent | 04242ff3ac0abbaa4362f97781dac268e6c3541a (diff) | |
Merge tag 'ceph-for-5.0-rc8' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"Two bug fixes for old issues, both marked for stable"
* tag 'ceph-for-5.0-rc8' of git://github.com/ceph/ceph-client:
ceph: avoid repeatedly adding inode to mdsc->snap_flush_list
libceph: handle an empty authorize reply
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/snap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index 041c27ea8de1..f74193da0e09 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -616,7 +616,8 @@ int __ceph_finish_cap_snap(struct ceph_inode_info *ci, capsnap->size); spin_lock(&mdsc->snap_flush_lock); - list_add_tail(&ci->i_snap_flush_item, &mdsc->snap_flush_list); + if (list_empty(&ci->i_snap_flush_item)) + list_add_tail(&ci->i_snap_flush_item, &mdsc->snap_flush_list); spin_unlock(&mdsc->snap_flush_lock); return 1; /* caller may want to ceph_flush_snaps */ } |