LU-506 kernel: FC15 - file_operations relate changes.

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

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 50763ed..f797851 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -1888,7 +1888,7 @@ loff_t ll_file_seek(struct file *file, loff_t offset, int origin)
         if (origin == 2) { /* SEEK_END */
                 int rc;
 
-                rc = cl_glimpse_size(inode);
+                rc = ll_glimpse_size(inode);
                 if (rc != 0)
                         RETURN(rc);
 
@@ -1938,9 +1938,13 @@ int ll_flush(struct file *file)
         return rc ? -EIO : 0;
 }
 
+#ifndef HAVE_FILE_FSYNC_2ARGS
 int ll_fsync(struct file *file, struct dentry *dentry, int data)
+#else
+int ll_fsync(struct file *file, int data)
+#endif
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = file->f_dentry->d_inode;
         struct ll_inode_info *lli = ll_i2info(inode);
         struct lov_stripe_md *lsm = lli->lli_smd;
         struct ptlrpc_request *req;
@@ -2351,11 +2355,11 @@ int ll_inode_revalidate_it(struct dentry *dentry, struct lookup_intent *it,
                 RETURN(0);
         }
 
-        /* cl_glimpse_size will prefer locally cached writes if they extend
+        /* ll_glimpse_size will prefer locally cached writes if they extend
          * the file */
 
         if (rc == 0)
-                rc = cl_glimpse_size(inode);
+                rc = ll_glimpse_size(inode);
 
         RETURN(rc);
 }