mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

ceph: increment change_attribute on local changes

Browse source 
We don't set SB_I_VERSION on ceph since we need to manage it ourselves,
so we must increment it whenever we update the file times.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Jeff Layton 2019-06-06 08:57:27 -04:00 committed by Ilya Dryomov
parent 176c77c9c9
commit 5c30835690
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/ceph/addr.c
View file

@ -10,6 +10,7 @@
#include <linux/pagevec.h> #include <linux/pagevec.h>
#include <linux/task_io_accounting_ops.h> #include <linux/task_io_accounting_ops.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/iversion.h>
#include "super.h" #include "super.h"
#include "mds_client.h" #include "mds_client.h"
@ -1576,6 +1577,7 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf)
/* Update time before taking page lock */ /* Update time before taking page lock */
file_update_time(vma->vm_file); file_update_time(vma->vm_file);
inode_inc_iversion_raw(inode);
do { do {
lock_page(page); lock_page(page);

5
fs/ceph/file.c
View file

@ -10,6 +10,7 @@
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/writeback.h> #include <linux/writeback.h>
#include <linux/falloc.h> #include <linux/falloc.h>
#include <linux/iversion.h>
#include "super.h" #include "super.h"
#include "mds_client.h" #include "mds_client.h"
@ -1435,6 +1436,8 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from)
if (err) if (err)
goto out; goto out;
inode_inc_iversion_raw(inode);
if (ci->i_inline_version != CEPH_INLINE_NONE) { if (ci->i_inline_version != CEPH_INLINE_NONE) {
err = ceph_uninline_data(file, NULL); err = ceph_uninline_data(file, NULL);
if (err < 0) if (err < 0)
@ -2064,6 +2067,8 @@ static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off,
do_final_copy = true; do_final_copy = true;
file_update_time(dst_file); file_update_time(dst_file);
inode_inc_iversion_raw(dst_inode);
if (endoff > size) { if (endoff > size) {
int caps_flags = 0; int caps_flags = 0;