diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2014-03-09 16:16:40 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2014-04-05 06:07:11 +0200 |
| commit | eb13e832f823f6c110ea53e3067bafe22b87de63 (patch) | |
| tree | e7e06eaf5ded86bb0d64b363b1c98c5909cf4847 /fs/ceph/super.c | |
| parent | ceph: forbid mandatory file lock (diff) | |
| download | linux-eb13e832f823f6c110ea53e3067bafe22b87de63.tar.xz linux-eb13e832f823f6c110ea53e3067bafe22b87de63.zip | |
ceph: use fl->fl_file as owner identifier of flock and posix lock
flock and posix lock should use fl->fl_file instead of process ID
as owner identifier. (posix lock uses fl->fl_owner. fl->fl_owner
is usually equal to fl->fl_file, but it also can be a customized
value). The process ID of who holds the lock is just for F_GETLK
fcntl(2).
The fix is rename the 'pid' fields of struct ceph_mds_request_args
and struct ceph_filelock to 'owner', rename 'pid_namespace' fields
to 'pid'. Assign fl->fl_file to the 'owner' field of lock messages.
We also set the most significant bit of the 'owner' field. MDS can
use that bit to distinguish between old and new clients.
The MDS counterpart of this patch modifies the flock code to not
take the 'pid_namespace' into consideration when checking conflict
locks.
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs/ceph/super.c')
| -rw-r--r-- | fs/ceph/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 10a4ccbf38da..06150fd745ac 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -1026,6 +1026,7 @@ static int __init init_ceph(void) if (ret) goto out; + ceph_flock_init(); ceph_xattr_init(); ret = register_filesystem(&ceph_fs_type); if (ret) |