From: Andreas Dilger Date: Tue, 27 Jun 2017 22:15:18 +0000 (-0600) Subject: LU-9679 ldlm: remove flock accessor macros X-Git-Tag: 2.10.53~20 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6815c3c849e25c060f44db7f730831bcbcbc9091 LU-9679 ldlm: remove flock accessor macros Remove old flock wrapper functions that were never used in the kernel: flock_type(), flock_set_type(), flock_pid(), flock_set_pid(), flock_start(), flock_set_start(), flock_end(), flock_set_end() so that our code is closer to that in the upstream kernel. Test-Parameters: trivial Signed-off-by: Andreas Dilger Change-Id: I8709da925f4aa4650088f72d7e26f5e6281cab07 Reviewed-on: https://review.whamcloud.com/27856 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Steve Guminski Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- diff --git a/contrib/scripts/libcfs_cleanup.sed b/contrib/scripts/libcfs_cleanup.sed index af7f758..4a9aa33 100644 --- a/contrib/scripts/libcfs_cleanup.sed +++ b/contrib/scripts/libcfs_cleanup.sed @@ -245,14 +245,14 @@ s/\bcfs_file_count\b/file_count/g s/\bCFS_INT_LIMIT\b/INT_LIMIT/g s/\bCFS_OFFSET_MAX\b/OFFSET_MAX/g s/\bcfs_flock_t\b/struct file_lock/g -s/\bcfs_flock_type\b/flock_type/g -s/\bcfs_flock_set_type\b/flock_set_type/g -s/\bcfs_flock_pid\b/flock_pid/g -s/\bcfs_flock_set_pid\b/flock_set_pid/g -s/\bcfs_flock_start\b/flock_start/g -s/\bcfs_flock_set_start\b/flock_set_start/g -s/\bcfs_flock_end\b/flock_end/g -s/\bcfs_flock_set_end\b/flock_set_end/g +s/\b[cfs_]*flock_type(\([^)]*\))\b/\1->fl_type/g +s/\b[cfs_]*flock_set_type(\([^,]*\), \([^)]*\))\b/\1->fl_type = \2/g +s/\b[cfs_]*flock_pid(\([^)]*\))\b/\1->fl_pid/g +s/\b[cfs_]*flock_set_pid(\([^,]*\), \([^)]*\))\b/\1->fl_pid = \2/g +s/\b[cfs_]*flock_start(\([^)]*\))\b/\1->fl_start/g +s/\b[cfs_]*flock_set_start(\([^,]*\), \([^)]*\))\b/\1->fl_start = \2/g +s/\b[cfs_]*flock_end(\([^)]*\))\b/\1->fl_end/g +s/\b[cfs_]*flock_set_end(\([^,]*\), \([^)]*\))\b/\1->fl_end = \2/g s/\bcfs_user_write\b/user_write/g s/\bCFS_IFSHIFT\b/IFSHIFT/g s/\bCFS_IFTODT\b/IFTODT/g diff --git a/libcfs/include/libcfs/linux/linux-fs.h b/libcfs/include/libcfs/linux/linux-fs.h index 59d9874..327793c 100644 --- a/libcfs/include/libcfs/linux/linux-fs.h +++ b/libcfs/include/libcfs/linux/linux-fs.h @@ -66,15 +66,6 @@ static inline struct dentry *file_dentry(const struct file *file) vfs_fsync_range(fp, file_dentry(fp), start, end, datasync) #endif -#define flock_type(fl) ((fl)->fl_type) -#define flock_set_type(fl, type) do { (fl)->fl_type = (type); } while (0) -#define flock_pid(fl) ((fl)->fl_pid) -#define flock_set_pid(fl, pid) do { (fl)->fl_pid = (pid); } while (0) -#define flock_start(fl) ((fl)->fl_start) -#define flock_set_start(fl, st) do { (fl)->fl_start = (st); } while (0) -#define flock_end(fl) ((fl)->fl_end) -#define flock_set_end(fl, end) do { (fl)->fl_end = (end); } while (0) - #ifndef IFSHIFT #define IFSHIFT 12 #endif diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c index b3d6697..344e35d 100644 --- a/lustre/ldlm/ldlm_flock.c +++ b/lustre/ldlm/ldlm_flock.c @@ -742,7 +742,7 @@ granted: RETURN(-EIO); } - /* ldlm_lock_enqueue() has already placed lock on the granted list. */ + /* ldlm_lock_enqueue() has already placed lock on the granted list. */ ldlm_resource_unlink_lock(lock); /* Import invalidation. We need to actually release the lock @@ -757,7 +757,7 @@ granted: LASSERT(ldlm_is_test_lock(lock)); if (ldlm_is_test_lock(lock) || ldlm_is_flock_deadlock(lock)) - mode = flock_type(getlk); + mode = getlk->fl_type; else mode = lock->l_granted_mode; @@ -780,27 +780,26 @@ granted: LDLM_DEBUG(lock, "client-side enqueue granted"); if (flags & LDLM_FL_TEST_LOCK) { - /* fcntl(F_GETLK) request */ - /* The old mode was saved in getlk->fl_type so that if the mode - * in the lock changes we can decref the appropriate refcount.*/ + /* + * fcntl(F_GETLK) request + * The old mode was saved in getlk->fl_type so that if the mode + * in the lock changes we can decref the appropriate refcount. + */ LASSERT(ldlm_is_test_lock(lock)); - ldlm_flock_destroy(lock, flock_type(getlk), - LDLM_FL_WAIT_NOREPROC); + ldlm_flock_destroy(lock, getlk->fl_type, LDLM_FL_WAIT_NOREPROC); switch (lock->l_granted_mode) { case LCK_PR: - flock_set_type(getlk, F_RDLCK); + getlk->fl_type = F_RDLCK; break; case LCK_PW: - flock_set_type(getlk, F_WRLCK); + getlk->fl_type = F_WRLCK; break; default: - flock_set_type(getlk, F_UNLCK); + getlk->fl_type = F_UNLCK; } - flock_set_pid(getlk, (pid_t)lock->l_policy_data.l_flock.pid); - flock_set_start(getlk, - (loff_t)lock->l_policy_data.l_flock.start); - flock_set_end(getlk, - (loff_t)lock->l_policy_data.l_flock.end); + getlk->fl_pid = (pid_t)lock->l_policy_data.l_flock.pid; + getlk->fl_start = (loff_t)lock->l_policy_data.l_flock.start; + getlk->fl_end = (loff_t)lock->l_policy_data.l_flock.end; } else { __u64 noreproc = LDLM_FL_WAIT_NOREPROC;