xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' into linux-next

Browse Source
This commit is contained in:
Trond Myklebust
2014-03-17 15:15:21 -04:00
parent 2ca310fc41 fdb63dcdb5
commit bd0f725c4c
17 changed files with 310 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/nfs4state.c
View File

@@ -1316,7 +1316,7 @@ static int nfs4_state_mark_reclaim_reboot(struct nfs_client *clp, struct nfs4_st
return 1;
}
static int nfs4_state_mark_reclaim_nograce(struct nfs_client *clp, struct nfs4_state *state)
int nfs4_state_mark_reclaim_nograce(struct nfs_client *clp, struct nfs4_state *state)
{
set_bit(NFS_STATE_RECLAIM_NOGRACE, &state->flags);
clear_bit(NFS_STATE_RECLAIM_REBOOT, &state->flags);