diff options
| author | Jeff Layton <jlayton@primarydata.com> | 2015-01-16 15:05:55 -0500 |
|---|---|---|
| committer | Jeff Layton <jeff.layton@primarydata.com> | 2015-01-16 16:08:16 -0500 |
| commit | bd61e0a9c852de2d705b6f1bb2cc54c5774db570 (patch) | |
| tree | 67a583912923f2ae621bddf94fbba8816cb0e49d /include | |
| parent | 5263e31e452fb84138b9bee061d5c06c0f359fea (diff) | |
| download | linux-stable-bd61e0a9c852de2d705b6f1bb2cc54c5774db570.tar.gz linux-stable-bd61e0a9c852de2d705b6f1bb2cc54c5774db570.tar.bz2 linux-stable-bd61e0a9c852de2d705b6f1bb2cc54c5774db570.zip | |
locks: convert posix locks to file_lock_context
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index dec0d38b05de..571f113588e9 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -968,6 +968,7 @@ struct file_lock { struct file_lock_context { struct list_head flc_flock; + struct list_head flc_posix; }; /* The following constant reflects the upper bound of the file/locking space */ @@ -1971,7 +1972,7 @@ static inline int locks_verify_truncate(struct inode *inode, struct file *filp, loff_t size) { - if (inode->i_flock && mandatory_lock(inode)) + if (inode->i_flctx && mandatory_lock(inode)) return locks_mandatory_area( FLOCK_VERIFY_WRITE, inode, filp, size < inode->i_size ? size : inode->i_size, |