LU-1030 osc: new IO engine implementation

[fs/lustre-release.git] / lustre / llite / llite_lib.c

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 78ba6bb..050a9a3 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -1839,13 +1839,19 @@ void ll_read_inode2(struct inode *inode, void *opaque)
 
 void ll_delete_inode(struct inode *inode)
 {
-        struct ll_sb_info *sbi = ll_i2sbi(inode);
-        int rc;
-        ENTRY;
-
-        rc = obd_fid_delete(sbi->ll_md_exp, ll_inode2fid(inode));
-        if (rc)
-                CERROR("fid_delete() failed, rc %d\n", rc);
+       struct cl_inode_info *lli = cl_i2info(inode);
+       struct ll_sb_info    *sbi = ll_i2sbi(inode);
+       int rc;
+       ENTRY;
+
+       rc = obd_fid_delete(sbi->ll_md_exp, ll_inode2fid(inode));
+       if (rc)
+               CERROR("fid_delete() failed, rc %d\n", rc);
+
+       if (S_ISREG(inode->i_mode) && lli->lli_clob != NULL)
+               /* discard all dirty pages before truncating them, required by
+                * osc_extent implementation at LU-1030. */
+               cl_sync_file_range(inode, 0, OBD_OBJECT_EOF, CL_FSYNC_DISCARD);
 
         truncate_inode_pages(&inode->i_data, 0);