diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2006-06-25 08:48:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 13:01:19 -0400 |
commit | 7142125937e1482ad3ae4366594c6586153dfc86 (patch) | |
tree | 8d85908a36485df0c80de2032e7fcfa493621fe4 /fs/fuse/fuse_i.h | |
parent | bafa96541b250a7051e3fbc5de6e8369daf8ffec (diff) |
[PATCH] fuse: add POSIX file locking support
This patch adds POSIX file locking support to the fuse interface.
This implementation doesn't keep any locking state in kernel. Unlocking on
close() is handled by the FLUSH message, which now contains the lock owner id.
Mandatory locking is not supported. The filesystem may enfoce mandatory
locking in userspace if needed.
Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/fuse/fuse_i.h')
-rw-r--r-- | fs/fuse/fuse_i.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index ac12b01f4446..eb3166625ca9 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h | |||
@@ -190,6 +190,7 @@ struct fuse_req { | |||
190 | struct fuse_init_in init_in; | 190 | struct fuse_init_in init_in; |
191 | struct fuse_init_out init_out; | 191 | struct fuse_init_out init_out; |
192 | struct fuse_read_in read_in; | 192 | struct fuse_read_in read_in; |
193 | struct fuse_lk_in lk_in; | ||
193 | } misc; | 194 | } misc; |
194 | 195 | ||
195 | /** page vector */ | 196 | /** page vector */ |
@@ -307,6 +308,9 @@ struct fuse_conn { | |||
307 | /** Is removexattr not implemented by fs? */ | 308 | /** Is removexattr not implemented by fs? */ |
308 | unsigned no_removexattr : 1; | 309 | unsigned no_removexattr : 1; |
309 | 310 | ||
311 | /** Are file locking primitives not implemented by fs? */ | ||
312 | unsigned no_lock : 1; | ||
313 | |||
310 | /** Is access not implemented by fs? */ | 314 | /** Is access not implemented by fs? */ |
311 | unsigned no_access : 1; | 315 | unsigned no_access : 1; |
312 | 316 | ||