Merge branch 'for-lustre' into for-next

diff --cc drivers/staging/lustre/lustre/llite/file.c
index 08e77492da8fef55677702bcbe694ebd18024827,37b7c93717a1a61b07c488c5038993ae9a6b8165..a2ae9a68a9a0906ce7d731e2f54410ace068412e
--- 1/drivers/staging/lustre/lustre/llite/file.c
--- 2/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@@ -2622,10 -2611,15 +2611,9 @@@ int cl_sync_file_range(struct inode *in
        return result;
  }
  
 -/*
 - * When dentry is provided (the 'else' case), *file->f_dentry may be
 - * null and dentry must be used directly rather than pulled from
 - * *file->f_dentry as is done otherwise.
 - */
 -
  int ll_fsync(struct file *file, loff_t start, loff_t end, int datasync)
  {
-       struct dentry *dentry = file->f_dentry;
-       struct inode *inode = dentry->d_inode;
+       struct inode *inode = file_inode(file);
        struct ll_inode_info *lli = ll_i2info(inode);
        struct ptlrpc_request *req;
        struct obd_capa *oc;