diff options
| author | Yan, Zheng <zyan@redhat.com> | 2015-05-25 17:36:42 +0800 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2015-06-25 11:49:30 +0300 |
| commit | 41445999aeec1f0fdf196ab55b2c770473b2ea01 (patch) | |
| tree | 35d1112d66d1fc1c07aec89c54047bff6583363c /fs | |
| parent | 3e0708b990f7e46d87d47b3b06de322490f2f2ee (diff) | |
| download | linux-stable-41445999aeec1f0fdf196ab55b2c770473b2ea01.tar.gz linux-stable-41445999aeec1f0fdf196ab55b2c770473b2ea01.tar.bz2 linux-stable-41445999aeec1f0fdf196ab55b2c770473b2ea01.zip | |
ceph: don't include used caps in cap_wanted
when copying files to cephfs, file data may stay in page cache after
corresponding file is closed. Cached data use Fc capability. If we
include Fc capability in cap_wanted, MDS will treat files with cached
data as open files, and journal them in an EOpen event when trimming
log segment.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/caps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 245ca381a6dc..a80a899e5c41 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -1525,13 +1525,13 @@ retry: retry_locked: file_wanted = __ceph_caps_file_wanted(ci); used = __ceph_caps_used(ci); - want = file_wanted | used; issued = __ceph_caps_issued(ci, &implemented); revoking = implemented & ~issued; - retain = want | CEPH_CAP_PIN; + want = file_wanted; + retain = file_wanted | used | CEPH_CAP_PIN; if (!mdsc->stopping && inode->i_nlink > 0) { - if (want) { + if (file_wanted) { retain |= CEPH_CAP_ANY; /* be greedy */ } else if (S_ISDIR(inode->i_mode) && (issued & CEPH_CAP_FILE_SHARED) && |