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-4712 llite: lock the inode to be migrated
[fs/lustre-release.git]
/
lustre
/
llite
/
lloop.c
diff --git
a/lustre/llite/lloop.c
b/lustre/llite/lloop.c
index
b8d7ca5
..
f3bf6de
100644
(file)
--- a/
lustre/llite/lloop.c
+++ b/
lustre/llite/lloop.c
@@
-27,7
+27,7
@@
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 201
3
, Intel Corporation.
+ * Copyright (c) 2011, 201
4
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-105,7
+105,6
@@
#include <asm/uaccess.h>
#include <lustre_lib.h>
#include <asm/uaccess.h>
#include <lustre_lib.h>
-#include <lustre_lite.h>
#include "llite_internal.h"
#define LLOOP_MAX_SEGMENTS LNET_MAX_IOV
#include "llite_internal.h"
#define LLOOP_MAX_SEGMENTS LNET_MAX_IOV
@@
-200,7
+199,7
@@
static int do_bio_lustrebacked(struct lloop_device *lo, struct bio *head)
struct bio_vec *bvec;
#endif
int rw;
struct bio_vec *bvec;
#endif
int rw;
-
obd_count
page_count = 0;
+
size_t
page_count = 0;
struct bio *bio;
ssize_t bytes;
struct bio *bio;
ssize_t bytes;