From: green@linuxhacker.ru
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Andreas Dilger <andreas.dilger@intel.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Oleg Drokin <green@linuxhacker.ru>,
Oleg Drokin <oleg.drokin@intel.com>
Subject: [PATCH 12/13] staging/lustre: Get rid of inode_dio_write_done and inode_dio_read
Date: Thu, 30 Jul 2015 18:28:03 -0400 [thread overview]
Message-ID: <1438295284-2307773-13-git-send-email-green@linuxhacker.ru> (raw)
In-Reply-To: <1438295284-2307773-1-git-send-email-green@linuxhacker.ru>
From: Oleg Drokin <green@linuxhacker.ru>
These primitives are long deprecated and unused.
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
---
drivers/staging/lustre/lustre/include/linux/lustre_compat25.h | 5 -----
drivers/staging/lustre/lustre/llite/llite_lib.c | 5 +----
drivers/staging/lustre/lustre/llite/vvp_io.c | 5 ++---
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
index 157bafb..6b14406 100644
--- a/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
@@ -64,11 +64,6 @@
#define LTIME_S(time) (time.tv_sec)
-/* inode_dio_wait(i) use as-is for write lock */
-# define inode_dio_write_done(i) do {} while (0) /* for write unlock */
-# define inode_dio_read(i) atomic_inc(&(i)->i_dio_count)
-/* inode_dio_done(i) use as-is for read unlock */
-
#ifndef QUOTA_OK
# define QUOTA_OK 0
#endif
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index 39f0b2a..55e2dc6 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -1356,11 +1356,8 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
if (!op_data)
return -ENOMEM;
- if (!S_ISDIR(inode->i_mode)) {
- if (attr->ia_valid & ATTR_SIZE)
- inode_dio_write_done(inode);
+ if (!S_ISDIR(inode->i_mode))
mutex_unlock(&inode->i_mutex);
- }
memcpy(&op_data->op_attr, attr, sizeof(*attr));
diff --git a/drivers/staging/lustre/lustre/llite/vvp_io.c b/drivers/staging/lustre/lustre/llite/vvp_io.c
index 91bba79..a659962 100644
--- a/drivers/staging/lustre/lustre/llite/vvp_io.c
+++ b/drivers/staging/lustre/lustre/llite/vvp_io.c
@@ -455,12 +455,11 @@ static void vvp_io_setattr_end(const struct lu_env *env,
struct cl_io *io = ios->cis_io;
struct inode *inode = ccc_object_inode(io->ci_obj);
- if (cl_io_is_trunc(io)) {
+ if (cl_io_is_trunc(io))
/* Truncate in memory pages - they must be clean pages
* because osc has already notified to destroy osc_extents. */
vvp_do_vmtruncate(inode, io->u.ci_setattr.sa_attr.lvb_size);
- inode_dio_write_done(inode);
- }
+
mutex_unlock(&inode->i_mutex);
}
--
2.1.0
next prev parent reply other threads:[~2015-07-30 22:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-30 22:27 [PATCH 00/13] Removal of lustre compat macros green
2015-07-30 22:27 ` [PATCH 01/13] staging/lustre: Remove unused ll_vfs_* compat defines green
2015-07-30 22:27 ` [PATCH 02/13] staging/lustre: get rid of cfs_bio_* compat macroses green
2015-07-30 22:27 ` [PATCH 03/13] staging/lustre: Drop FS_HAS_FIEMAP compat macro green
2015-07-30 22:27 ` [PATCH 04/13] staging/lustre: Drop SLAB_DESTROY_BY_RCU redefine, it's always defined green
2015-07-30 22:27 ` [PATCH 05/13] staging/lustre: remove *hw_segments compat defines green
2015-07-30 22:27 ` [PATCH 06/13] staging/lustre: Drop SEEK_* definition checks green
2015-07-31 23:00 ` Greg Kroah-Hartman
2015-07-31 23:37 ` Oleg Drokin
2015-07-30 22:27 ` [PATCH 07/13] staging/lustre: Drop FMODE_UNSIGNED_OFFSET define green
2015-07-30 22:27 ` [PATCH 08/13] staging/lustre: replace ll_umode_t with umode_t green
2015-07-30 22:28 ` [PATCH 09/13] staging/lustre: Use hlist primitives directly green
2015-07-30 22:28 ` [PATCH 10/13] staging/lustre: Get rid of ll_pagevec_ macros green
2015-07-30 22:28 ` [PATCH 11/13] staging/lustre: ATTR_TIMES_SET is always defined, so don't check it green
2015-07-30 22:28 ` green [this message]
2015-07-30 22:28 ` [PATCH 13/13] staging/lustre: use ATTR_OPEN directly, remove ATTR_RAW green
2015-07-31 23:03 ` [PATCH 00/13] Removal of lustre compat macros Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438295284-2307773-13-git-send-email-green@linuxhacker.ru \
--to=green@linuxhacker.ru \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg.drokin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome