diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2014-10-31 01:22:04 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-19 13:01:25 -0500 |
| commit | b583043e99bc6d91e98fae32bd9eff6a5958240a (patch) | |
| tree | 8f2f9a4d28ae16c7d452808ff400bb1f31fb09c8 /drivers/staging/lustre | |
| parent | lockd: get rid of ->f_path.dentry->d_sb (diff) | |
| download | linux-dev-b583043e99bc6d91e98fae32bd9eff6a5958240a.tar.xz linux-dev-b583043e99bc6d91e98fae32bd9eff6a5958240a.zip | |
kill f_dentry uses
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/file.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c index c99b74117152..08e77492da8f 100644 --- a/drivers/staging/lustre/lustre/llite/file.c +++ b/drivers/staging/lustre/lustre/llite/file.c @@ -2092,7 +2092,7 @@ putgl: rc = 0; if (llss->ia2.ia_valid != 0) { mutex_lock(&llss->inode1->i_mutex); - rc = ll_setattr(file1->f_dentry, &llss->ia2); + rc = ll_setattr(file1->f_path.dentry, &llss->ia2); mutex_unlock(&llss->inode1->i_mutex); } @@ -2100,7 +2100,7 @@ putgl: int rc1; mutex_lock(&llss->inode2->i_mutex); - rc1 = ll_setattr(file2->f_dentry, &llss->ia1); + rc1 = ll_setattr(file2->f_path.dentry, &llss->ia1); mutex_unlock(&llss->inode2->i_mutex); if (rc == 0) rc = rc1; @@ -2185,7 +2185,7 @@ static int ll_hsm_import(struct inode *inode, struct file *file, mutex_lock(&inode->i_mutex); - rc = ll_setattr_raw(file->f_dentry, attr, true); + rc = ll_setattr_raw(file->f_path.dentry, attr, true); if (rc == -ENODATA) rc = 0; @@ -2622,12 +2622,6 @@ int cl_sync_file_range(struct inode *inode, loff_t start, loff_t end, 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; |