iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: lustre: llite: remove obsolete conditional code

Browse Source 
Remove conditional flock/aops code that was only for out-of-tree
vendor kernels but is not relevant for in-kernel code.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andreas Dilger 2015-04-08 17:24:02 -06:00 committed by Greg Kroah-Hartman
parent 41d98f584f
commit 3746e6f93b
3 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/lustre/lustre/llite/llite_internal.h
View File

@ -727,11 +727,7 @@ int ll_readahead(const struct lu_env *env, struct cl_io *io,
struct ll_readahead_state *ras, struct address_space *mapping,
struct cl_page_list *queue, int flags);
#ifndef MS_HAS_NEW_AOPS
extern const struct address_space_operations ll_aops;
#else
extern const struct address_space_operations_ext ll_aops;
#endif
/* llite/file.c */
extern struct file_operations ll_file_operations;

8
drivers/staging/lustre/lustre/llite/llite_lib.c
View File

@ -227,14 +227,6 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
if (sbi->ll_flags & LL_SBI_USER_XATTR)
data->ocd_connect_flags |= OBD_CONNECT_XATTR;
#ifdef HAVE_MS_FLOCK_LOCK
/* force vfs to use lustre handler for flock() calls - bug 10743 */
sb->s_flags |= MS_FLOCK_LOCK;
#endif
#ifdef MS_HAS_NEW_AOPS
sb->s_flags |= MS_HAS_NEW_AOPS;
#endif
if (sbi->ll_flags & LL_SBI_FLOCK)
sbi->ll_fop = &ll_file_operations_flock;
else if (sbi->ll_flags & LL_SBI_LOCALFLOCK)

20
drivers/staging/lustre/lustre/llite/rw26.c
View File

@ -517,7 +517,6 @@ static int ll_migratepage(struct address_space *mapping,
}
#endif
#ifndef MS_HAS_NEW_AOPS
const struct address_space_operations ll_aops = {
.readpage = ll_readpage,
.direct_IO = ll_direct_IO_26,
@ -532,22 +531,3 @@ const struct address_space_operations ll_aops = {
.migratepage = ll_migratepage,
#endif
};
#else
const struct address_space_operations_ext ll_aops = {
.orig_aops.readpage = ll_readpage,
/* .orig_aops.readpages = ll_readpages, */
.orig_aops.direct_IO = ll_direct_IO_26,
.orig_aops.writepage = ll_writepage,
.orig_aops.writepages = ll_writepages,
.orig_aops.set_page_dirty = ll_set_page_dirty,
.orig_aops.prepare_write = ll_prepare_write,
.orig_aops.commit_write = ll_commit_write,
.orig_aops.invalidatepage = ll_invalidatepage,
.orig_aops.releasepage = ll_releasepage,
#ifdef CONFIG_MIGRATION
.orig_aops.migratepage = ll_migratepage,
#endif
.write_begin = ll_write_begin,
.write_end = ll_write_end
};
#endif