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

Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

Browse Source 
vfs/nfs: fixup for nfs_open_context change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Stephen Rothwell
2011-07-25 13:59:46 -04:00
committed by Trond Myklebust
parent 34006cee28 b6844e8f64
commit 5f00bcb38e
3918 changed files with 249717 additions and 113738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/nfs/nfs4state.c
View File

@@ -641,7 +641,7 @@ void nfs4_put_open_state(struct nfs4_state *state)
/*
* Close the current file.
*/
static void __nfs4_close(struct path *path, struct nfs4_state *state,
static void __nfs4_close(struct nfs4_state *state,
fmode_t fmode, gfp_t gfp_mask, int wait)
{
struct nfs4_state_owner *owner = state->owner;
@@ -685,18 +685,18 @@ static void __nfs4_close(struct path *path, struct nfs4_state *state,
} else {
bool roc = pnfs_roc(state->inode);
nfs4_do_close(path, state, gfp_mask, wait, roc);
nfs4_do_close(state, gfp_mask, wait, roc);
}
}
void nfs4_close_state(struct path *path, struct nfs4_state *state, fmode_t fmode)
void nfs4_close_state(struct nfs4_state *state, fmode_t fmode)
{
__nfs4_close(path, state, fmode, GFP_NOFS, 0);
__nfs4_close(state, fmode, GFP_NOFS, 0);
}
void nfs4_close_sync(struct path *path, struct nfs4_state *state, fmode_t fmode)
void nfs4_close_sync(struct nfs4_state *state, fmode_t fmode)
{
__nfs4_close(path, state, fmode, GFP_KERNEL, 1);
__nfs4_close(state, fmode, GFP_KERNEL, 1);
}
/*