aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJeff Layton <jlayton@primarydata.com>2015-01-16 15:05:55 -0500
committerJeff Layton <jeff.layton@primarydata.com>2015-01-16 16:08:16 -0500
commitbd61e0a9c852de2d705b6f1bb2cc54c5774db570 (patch)
tree67a583912923f2ae621bddf94fbba8816cb0e49d /include/linux
parent5263e31e452fb84138b9bee061d5c06c0f359fea (diff)
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/linux')
-rw-r--r--include/linux/fs.h3
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 {
968 968
969struct file_lock_context { 969struct file_lock_context {
970 struct list_head flc_flock; 970 struct list_head flc_flock;
971 struct list_head flc_posix;
971}; 972};
972 973
973/* The following constant reflects the upper bound of the file/locking space */ 974/* 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,
1971 struct file *filp, 1972 struct file *filp,
1972 loff_t size) 1973 loff_t size)
1973{ 1974{
1974 if (inode->i_flock && mandatory_lock(inode)) 1975 if (inode->i_flctx && mandatory_lock(inode))
1975 return locks_mandatory_area( 1976 return locks_mandatory_area(
1976 FLOCK_VERIFY_WRITE, inode, filp, 1977 FLOCK_VERIFY_WRITE, inode, filp,
1977 size < inode->i_size ? size : inode->i_size, 1978 size < inode->i_size ? size : inode->i_size,