Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
3609404f
Commit
3609404f
authored
Jul 06, 2016
by
Yan, Zheng
Committed by
Ilya Dryomov
Jul 28, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ceph: update types of some local varibles
Signed-off-by:
Yan, Zheng
<
zyan@redhat.com
>
parent
3469ed0d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
fs/ceph/caps.c
fs/ceph/caps.c
+12
-11
No files found.
fs/ceph/caps.c
View file @
3609404f
...
@@ -993,7 +993,7 @@ static int send_cap_msg(struct ceph_mds_session *session,
...
@@ -993,7 +993,7 @@ static int send_cap_msg(struct ceph_mds_session *session,
u32
seq
,
u64
flush_tid
,
u64
oldest_flush_tid
,
u32
seq
,
u64
flush_tid
,
u64
oldest_flush_tid
,
u32
issue_seq
,
u32
mseq
,
u64
size
,
u64
max_size
,
u32
issue_seq
,
u32
mseq
,
u64
size
,
u64
max_size
,
struct
timespec
*
mtime
,
struct
timespec
*
atime
,
struct
timespec
*
mtime
,
struct
timespec
*
atime
,
struct
timespec
*
ctime
,
u
64
time_warp_seq
,
struct
timespec
*
ctime
,
u
32
time_warp_seq
,
kuid_t
uid
,
kgid_t
gid
,
umode_t
mode
,
kuid_t
uid
,
kgid_t
gid
,
umode_t
mode
,
u64
xattr_version
,
u64
xattr_version
,
struct
ceph_buffer
*
xattrs_buf
,
struct
ceph_buffer
*
xattrs_buf
,
...
@@ -1118,8 +1118,8 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
...
@@ -1118,8 +1118,8 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
struct
inode
*
inode
=
&
ci
->
vfs_inode
;
struct
inode
*
inode
=
&
ci
->
vfs_inode
;
u64
cap_id
=
cap
->
cap_id
;
u64
cap_id
=
cap
->
cap_id
;
int
held
,
revoking
,
dropping
,
keep
;
int
held
,
revoking
,
dropping
,
keep
;
u64
seq
,
issue_seq
,
mseq
,
time_warp_seq
,
follows
;
u64
follows
,
size
,
max_size
;
u
64
size
,
max_size
;
u
32
seq
,
issue_seq
,
mseq
,
time_warp_seq
;
struct
timespec
mtime
,
atime
,
ctime
;
struct
timespec
mtime
,
atime
,
ctime
;
int
wake
=
0
;
int
wake
=
0
;
umode_t
mode
;
umode_t
mode
;
...
@@ -1585,10 +1585,11 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,
...
@@ -1585,10 +1585,11 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,
int
mds
=
-
1
;
/* keep track of how far we've gone through i_caps list
int
mds
=
-
1
;
/* keep track of how far we've gone through i_caps list
to avoid an infinite loop on retry */
to avoid an infinite loop on retry */
struct
rb_node
*
p
;
struct
rb_node
*
p
;
int
tried_invalidate
=
0
;
int
delayed
=
0
,
sent
=
0
,
num
;
int
delayed
=
0
,
sent
=
0
,
force_requeue
=
0
,
num
;
bool
is_delayed
=
flags
&
CHECK_CAPS_NODELAY
;
int
queue_invalidate
=
0
;
bool
queue_invalidate
=
false
;
int
is_delayed
=
flags
&
CHECK_CAPS_NODELAY
;
bool
force_requeue
=
false
;
bool
tried_invalidate
=
false
;
/* if we are unmounting, flush any unused caps immediately. */
/* if we are unmounting, flush any unused caps immediately. */
if
(
mdsc
->
stopping
)
if
(
mdsc
->
stopping
)
...
@@ -1668,17 +1669,17 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,
...
@@ -1668,17 +1669,17 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,
if
(
revoking
&
(
CEPH_CAP_FILE_CACHE
|
if
(
revoking
&
(
CEPH_CAP_FILE_CACHE
|
CEPH_CAP_FILE_LAZYIO
))
{
CEPH_CAP_FILE_LAZYIO
))
{
dout
(
"check_caps queuing invalidate
\n
"
);
dout
(
"check_caps queuing invalidate
\n
"
);
queue_invalidate
=
1
;
queue_invalidate
=
true
;
ci
->
i_rdcache_revoking
=
ci
->
i_rdcache_gen
;
ci
->
i_rdcache_revoking
=
ci
->
i_rdcache_gen
;
}
else
{
}
else
{
dout
(
"check_caps failed to invalidate pages
\n
"
);
dout
(
"check_caps failed to invalidate pages
\n
"
);
/* we failed to invalidate pages. check these
/* we failed to invalidate pages. check these
caps again later. */
caps again later. */
force_requeue
=
1
;
force_requeue
=
true
;
__cap_set_timeouts
(
mdsc
,
ci
);
__cap_set_timeouts
(
mdsc
,
ci
);
}
}
}
}
tried_invalidate
=
1
;
tried_invalidate
=
true
;
goto
retry_locked
;
goto
retry_locked
;
}
}
...
@@ -1824,7 +1825,7 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,
...
@@ -1824,7 +1825,7 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,
* otherwise cancel.
* otherwise cancel.
*/
*/
if
(
delayed
&&
is_delayed
)
if
(
delayed
&&
is_delayed
)
force_requeue
=
1
;
/* __send_cap delayed release; requeue */
force_requeue
=
true
;
/* __send_cap delayed release; requeue */
if
(
!
delayed
&&
!
is_delayed
)
if
(
!
delayed
&&
!
is_delayed
)
__cap_delay_cancel
(
mdsc
,
ci
);
__cap_delay_cancel
(
mdsc
,
ci
);
else
if
(
!
is_delayed
||
force_requeue
)
else
if
(
!
is_delayed
||
force_requeue
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment