diff options
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d856e9f5913b..2919271a983a 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -1390,7 +1390,7 @@ static int nfs4_intent_set_file(struct nameidata *nd, struct path *path, struct | |||
1390 | filp = lookup_instantiate_filp(nd, path->dentry, NULL); | 1390 | filp = lookup_instantiate_filp(nd, path->dentry, NULL); |
1391 | if (!IS_ERR(filp)) { | 1391 | if (!IS_ERR(filp)) { |
1392 | struct nfs_open_context *ctx; | 1392 | struct nfs_open_context *ctx; |
1393 | ctx = (struct nfs_open_context *)filp->private_data; | 1393 | ctx = nfs_file_open_context(filp); |
1394 | ctx->state = state; | 1394 | ctx->state = state; |
1395 | return 0; | 1395 | return 0; |
1396 | } | 1396 | } |
@@ -3303,7 +3303,7 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock * | |||
3303 | status = -ENOMEM; | 3303 | status = -ENOMEM; |
3304 | if (seqid == NULL) | 3304 | if (seqid == NULL) |
3305 | goto out; | 3305 | goto out; |
3306 | task = nfs4_do_unlck(request, request->fl_file->private_data, lsp, seqid); | 3306 | task = nfs4_do_unlck(request, nfs_file_open_context(request->fl_file), lsp, seqid); |
3307 | status = PTR_ERR(task); | 3307 | status = PTR_ERR(task); |
3308 | if (IS_ERR(task)) | 3308 | if (IS_ERR(task)) |
3309 | goto out; | 3309 | goto out; |
@@ -3447,7 +3447,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f | |||
3447 | int ret; | 3447 | int ret; |
3448 | 3448 | ||
3449 | dprintk("%s: begin!\n", __FUNCTION__); | 3449 | dprintk("%s: begin!\n", __FUNCTION__); |
3450 | data = nfs4_alloc_lockdata(fl, fl->fl_file->private_data, | 3450 | data = nfs4_alloc_lockdata(fl, nfs_file_open_context(fl->fl_file), |
3451 | fl->fl_u.nfs4_fl.owner); | 3451 | fl->fl_u.nfs4_fl.owner); |
3452 | if (data == NULL) | 3452 | if (data == NULL) |
3453 | return -ENOMEM; | 3453 | return -ENOMEM; |
@@ -3573,7 +3573,7 @@ nfs4_proc_lock(struct file *filp, int cmd, struct file_lock *request) | |||
3573 | int status; | 3573 | int status; |
3574 | 3574 | ||
3575 | /* verify open state */ | 3575 | /* verify open state */ |
3576 | ctx = (struct nfs_open_context *)filp->private_data; | 3576 | ctx = nfs_file_open_context(filp); |
3577 | state = ctx->state; | 3577 | state = ctx->state; |
3578 | 3578 | ||
3579 | if (request->fl_start < 0 || request->fl_end < 0) | 3579 | if (request->fl_start < 0 || request->fl_end < 0) |