LU-1199 build: Cleanup ldiskfs kernel config defines

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_io.c

diff --git a/lustre/osd-ldiskfs/osd_io.c b/lustre/osd-ldiskfs/osd_io.c
index b094b50..80c7d76 100644 (file)
--- a/lustre/osd-ldiskfs/osd_io.c
+++ b/lustre/osd-ldiskfs/osd_io.c
@@ -49,11 +49,6 @@
 /* prerequisite for linux/xattr.h */
 #include <linux/fs.h>
 
-/* ext_depth() */
-#include <ldiskfs/ldiskfs.h>
-#include <ldiskfs/ldiskfs_jbd2.h>
-#include <ldiskfs/ldiskfs_extents.h>
-
 /*
  * struct OBD_{ALLOC,FREE}*()
  * OBD_FAIL_CHECK
@@ -62,6 +57,9 @@
 
 #include "osd_internal.h"
 
+/* ext_depth() */
+#include <ldiskfs/ldiskfs_extents.h>
+
 #ifndef HAVE_PAGE_CONSTANT
 #define mapping_cap_page_constant_write(mapping) 0
 #define SetPageConstant(page) do {} while (0)
@@ -174,7 +172,7 @@ void osd_fini_iobuf(struct osd_device *d, struct osd_iobuf *iobuf)
         }
 }
 
-#ifndef __REQ_WRITE /* pre-2.6.35 */
+#ifndef REQ_WRITE /* pre-2.6.35 */
 #define __REQ_WRITE BIO_RW
 #endif
 
@@ -849,7 +847,7 @@ static int osd_write_commit(const struct lu_env *env, struct dt_object *dt,
                 if (isize > i_size_read(inode)) {
                         i_size_write(inode, isize);
                         LDISKFS_I(inode)->i_disksize = isize;
-                        inode->i_sb->s_op->dirty_inode(inode);
+                       ll_dirty_inode(inode, I_DIRTY_DATASYNC);
                 }
 
                 rc = osd_do_bio(osd, inode, iobuf);
@@ -1081,7 +1079,7 @@ static int osd_ldiskfs_writelink(struct inode *inode, char *buffer, int buflen)
         memcpy((char *)&LDISKFS_I(inode)->i_data, (char *)buffer, buflen);
         LDISKFS_I(inode)->i_disksize = buflen;
         i_size_write(inode, buflen);
-        inode->i_sb->s_op->dirty_inode(inode);
+       ll_dirty_inode(inode, I_DIRTY_DATASYNC);
 
         return 0;
 }
@@ -1158,8 +1156,8 @@ int osd_ldiskfs_write_record(struct inode *inode, void *buf, int bufsize,
                        dirty_inode = 1;
                }
                spin_unlock(&inode->i_lock);
-                if (dirty_inode)
-                        inode->i_sb->s_op->dirty_inode(inode);
+               if (dirty_inode)
+                       ll_dirty_inode(inode, I_DIRTY_DATASYNC);
         }
 
         if (err == 0)