diff options
| author | Jeff Layton <jeff.layton@primarydata.com> | 2015-01-16 21:05:58 +0100 |
|---|---|---|
| committer | Jeff Layton <jeff.layton@primarydata.com> | 2015-01-16 22:08:50 +0100 |
| commit | 3d8e560de4a076b302cb0cc17e998aaace2b176a (patch) | |
| tree | d63c4b03e7e1c5e937b49385d7f630b7921f1119 /fs/locks.c | |
| parent | locks: keep a count of locks on the flctx lists (diff) | |
| download | linux-3d8e560de4a076b302cb0cc17e998aaace2b176a.tar.xz linux-3d8e560de4a076b302cb0cc17e998aaace2b176a.zip | |
locks: consolidate NULL i_flctx checks in locks_remove_file
We have each of the locks_remove_* variants doing this individually.
Have the caller do it instead, and have locks_remove_flock and
locks_remove_lease just assume that it's a valid pointer.
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/locks.c b/fs/locks.c index bd578700342d..2fc36b3772a0 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2400,6 +2400,7 @@ void locks_remove_posix(struct file *filp, fl_owner_t owner) EXPORT_SYMBOL(locks_remove_posix); +/* The i_flctx must be valid when calling into here */ static void locks_remove_flock(struct file *filp) { @@ -2413,7 +2414,7 @@ locks_remove_flock(struct file *filp) }; struct file_lock_context *flctx = file_inode(filp)->i_flctx; - if (!flctx || list_empty(&flctx->flc_flock)) + if (list_empty(&flctx->flc_flock)) return; if (filp->f_op->flock) @@ -2425,6 +2426,7 @@ locks_remove_flock(struct file *filp) fl.fl_ops->fl_release_private(&fl); } +/* The i_flctx must be valid when calling into here */ static void locks_remove_lease(struct file *filp) { @@ -2433,7 +2435,7 @@ locks_remove_lease(struct file *filp) struct file_lock *fl, *tmp; LIST_HEAD(dispose); - if (!ctx || list_empty(&ctx->flc_lease)) + if (list_empty(&ctx->flc_lease)) return; spin_lock(&ctx->flc_lock); @@ -2448,6 +2450,9 @@ locks_remove_lease(struct file *filp) */ void locks_remove_file(struct file *filp) { + if (!file_inode(filp)->i_flctx) + return; + /* remove any OFD locks */ locks_remove_posix(filp, filp); |