diff options
| author | Mark Fasheh <mfasheh@suse.com> | 2008-07-21 14:29:16 -0700 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-10-13 13:57:57 -0700 |
| commit | 53da4939f349d4edd283b043219221ca5b78e4d4 (patch) | |
| tree | 3e0f8e1bd5474822431cffd1e449df9b639e1772 /fs/ocfs2/locks.c | |
| parent | a447c0932445f92ce6f4c1bd020f62c5097a7842 (diff) | |
| download | kernel_samsung_tuna-53da4939f349d4edd283b043219221ca5b78e4d4.zip kernel_samsung_tuna-53da4939f349d4edd283b043219221ca5b78e4d4.tar.gz kernel_samsung_tuna-53da4939f349d4edd283b043219221ca5b78e4d4.tar.bz2 | |
ocfs2: POSIX file locks support
This is actually pretty easy since fs/dlm already handles the bulk of the
work. The Ocfs2 userspace cluster stack module already uses fs/dlm as the
underlying lock manager, so I only had to add the right calls.
Cluster-aware POSIX locks ("plocks") can be turned off by the same means at
UNIX locks - mount with 'noflocks', or create a local-only Ocfs2 volume.
Internally, the file system uses two sets of file_operations, depending on
whether cluster aware plocks is required. This turns out to be easier than
implementing local-only versions of ->lock.
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/locks.c')
| -rw-r--r-- | fs/ocfs2/locks.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c index 203f871..544ac62 100644 --- a/fs/ocfs2/locks.c +++ b/fs/ocfs2/locks.c @@ -24,6 +24,7 @@ */ #include <linux/fs.h> +#include <linux/fcntl.h> #define MLOG_MASK_PREFIX ML_INODE #include <cluster/masklog.h> @@ -32,6 +33,7 @@ #include "dlmglue.h" #include "file.h" +#include "inode.h" #include "locks.h" static int ocfs2_do_flock(struct file *file, struct inode *inode, @@ -123,3 +125,16 @@ int ocfs2_flock(struct file *file, int cmd, struct file_lock *fl) else return ocfs2_do_flock(file, inode, cmd, fl); } + +int ocfs2_lock(struct file *file, int cmd, struct file_lock *fl) +{ + struct inode *inode = file->f_mapping->host; + struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); + + if (!(fl->fl_flags & FL_POSIX)) + return -ENOLCK; + if (__mandatory_lock(inode)) + return -ENOLCK; + + return ocfs2_plock(osb->cconn, OCFS2_I(inode)->ip_blkno, file, cmd, fl); +} |