diff options
| author |   Yan, Zheng <zyan@redhat.com> | 2014-10-22 17:13:26 -0700 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@redhat.com> | 2014-11-13 22:19:05 +0300 |
| commit | 3231300bb986947a6b74e7075d84a2f434e4d788 (patch) | |
| tree | f98b6eb988e762aa344871c88e13188f5c7a2982 /fs | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-dev-3231300bb986947a6b74e7075d84a2f434e4d788.tar.xz linux-dev-3231300bb986947a6b74e7075d84a2f434e4d788.zip | |
ceph: fix flush tid comparision
TID of cap flush ack is 64 bits, but ceph_inode_info::flushing_cap_tid
is only 16 bits. 16 bits should be plenty to let the cap flush updates
pipeline appropriately, but we need to cast in the proper direction when
comparing these differently-sized versions. So downcast the 64-bits one
to 16 bits.
Reflects ceph.git commit a5184cf46a6e867287e24aeb731634828467cd98.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/caps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 659f2ea9e6f7..cefca661464b 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -2638,7 +2638,7 @@ static void handle_cap_flush_ack(struct inode *inode, u64 flush_tid, for (i = 0; i < CEPH_CAP_BITS; i++) if ((dirty & (1 << i)) && - flush_tid == ci->i_cap_flush_tid[i]) + (u16)flush_tid == ci->i_cap_flush_tid[i]) cleaned |= 1 << i; dout("handle_cap_flush_ack inode %p mds%d seq %d on %s cleaned %s," |