From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 19 Nov 2014 18:01:59 +0000 (-0500)
Subject: Merge branch 'for-lustre' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e63fa0d458eb038e5f192fefde1b708718ec9190;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'for-lustre' into for-next
---

e63fa0d458eb038e5f192fefde1b708718ec9190
diff --cc drivers/staging/lustre/lustre/llite/file.c
index 08e77492da8f,37b7c93717a1..a2ae9a68a9a0
--- a/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;