libceph, rbd, ceph: WRITE | ONDISK -> WRITE

CEPH_OSD_FLAG_ONDISK is set in account_request().

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

1 files changed, 4 insertions, 11 deletions

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 023cb7fd9b5f..26cc95421cca 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -759,9 +759,7 @@ static void ceph_aio_retry_work(struct work_struct *work)
                 goto out;
         }
 
-        req->r_flags =  CEPH_OSD_FLAG_ORDERSNAP |
-                        CEPH_OSD_FLAG_ONDISK |
-                        CEPH_OSD_FLAG_WRITE;
+        req->r_flags = CEPH_OSD_FLAG_ORDERSNAP | CEPH_OSD_FLAG_WRITE;
         ceph_oloc_copy(&req->r_base_oloc, &orig_req->r_base_oloc);
         ceph_oid_copy(&req->r_base_oid, &orig_req->r_base_oid);
 
@@ -833,9 +831,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,
                 if (ret2 < 0)
                         dout("invalidate_inode_pages2_range returned %d\n", ret2);
 
-                flags = CEPH_OSD_FLAG_ORDERSNAP |
-                        CEPH_OSD_FLAG_ONDISK |
-                        CEPH_OSD_FLAG_WRITE;
+                flags = CEPH_OSD_FLAG_ORDERSNAP | CEPH_OSD_FLAG_WRITE;
         } else {
                 flags = CEPH_OSD_FLAG_READ;
         }
@@ -1034,9 +1030,7 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos,
         if (ret < 0)
                 dout("invalidate_inode_pages2_range returned %d\n", ret);
 
-        flags = CEPH_OSD_FLAG_ORDERSNAP |
-                CEPH_OSD_FLAG_ONDISK |
-                CEPH_OSD_FLAG_WRITE;
+        flags = CEPH_OSD_FLAG_ORDERSNAP | CEPH_OSD_FLAG_WRITE;
 
         while ((len = iov_iter_count(from)) > 0) {
                 size_t left;
@@ -1531,8 +1525,7 @@ static int ceph_zero_partial_object(struct inode *inode,
                                         ceph_vino(inode),
                                         offset, length,
                                         0, 1, op,
-                                        CEPH_OSD_FLAG_WRITE |
-                                        CEPH_OSD_FLAG_ONDISK,
+                                        CEPH_OSD_FLAG_WRITE,
                                         NULL, 0, 0, false);
         if (IS_ERR(req)) {
                 ret = PTR_ERR(req);