Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-8735 llite: Return -ERESTARTSYS in range_lock()
[fs/lustre-release.git]
/
lustre
/
llite
/
vvp_dev.c
diff --git
a/lustre/llite/vvp_dev.c
b/lustre/llite/vvp_dev.c
index
752261f
..
ab92d30
100644
(file)
--- a/
lustre/llite/vvp_dev.c
+++ b/
lustre/llite/vvp_dev.c
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-27,7
+23,7
@@
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 201
4
, Intel Corporation.
+ * Copyright (c) 2012, 201
6
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-317,7
+313,7
@@
int cl_sb_init(struct super_block *sb)
struct cl_device *cl;
struct lu_env *env;
int rc = 0;
struct cl_device *cl;
struct lu_env *env;
int rc = 0;
-
int
refcheck;
+
__u16
refcheck;
sbi = ll_s2sbi(sb);
env = cl_env_get(&refcheck);
sbi = ll_s2sbi(sb);
env = cl_env_get(&refcheck);
@@
-339,7
+335,7
@@
int cl_sb_fini(struct super_block *sb)
struct ll_sb_info *sbi;
struct lu_env *env;
struct cl_device *cld;
struct ll_sb_info *sbi;
struct lu_env *env;
struct cl_device *cld;
-
int
refcheck;
+
__u16
refcheck;
int result;
ENTRY;
int result;
ENTRY;
@@
-481,7
+477,7
@@
static loff_t vvp_pgcache_find(const struct lu_env *env,
id.vpi_index = vmpage->index;
/* Cant support over 16T file */
nr = !(vmpage->index > 0xffffffff);
id.vpi_index = vmpage->index;
/* Cant support over 16T file */
nr = !(vmpage->index > 0xffffffff);
- p
age_cache_releas
e(vmpage);
+ p
ut_pag
e(vmpage);
}
lu_object_ref_del(&clob->co_lu, "dump", current);
}
lu_object_ref_del(&clob->co_lu, "dump", current);
@@
-541,7
+537,7
@@
static int vvp_pgcache_show(struct seq_file *f, void *v)
struct cl_object *clob;
struct lu_env *env;
struct vvp_pgcache_id id;
struct cl_object *clob;
struct lu_env *env;
struct vvp_pgcache_id id;
-
int
refcheck;
+
__u16
refcheck;
int result;
env = cl_env_get(&refcheck);
int result;
env = cl_env_get(&refcheck);
@@
-562,7
+558,7
@@
static int vvp_pgcache_show(struct seq_file *f, void *v)
page = cl_vmpage_page(vmpage, clob);
unlock_page(vmpage);
page = cl_vmpage_page(vmpage, clob);
unlock_page(vmpage);
- p
age_cache_releas
e(vmpage);
+ p
ut_pag
e(vmpage);
}
seq_printf(f, "%8x@"DFID": ", id.vpi_index,
}
seq_printf(f, "%8x@"DFID": ", id.vpi_index,
@@
-587,7
+583,7
@@
static void *vvp_pgcache_start(struct seq_file *f, loff_t *pos)
{
struct ll_sb_info *sbi;
struct lu_env *env;
{
struct ll_sb_info *sbi;
struct lu_env *env;
-
int
refcheck;
+
__u16
refcheck;
sbi = f->private;
sbi = f->private;
@@
-611,7
+607,7
@@
static void *vvp_pgcache_next(struct seq_file *f, void *v, loff_t *pos)
{
struct ll_sb_info *sbi;
struct lu_env *env;
{
struct ll_sb_info *sbi;
struct lu_env *env;
-
int
refcheck;
+
__u16
refcheck;
env = cl_env_get(&refcheck);
if (!IS_ERR(env)) {
env = cl_env_get(&refcheck);
if (!IS_ERR(env)) {