ocfs2: Skip check for mandatory locks when unlocking
PATCH 1/1 ocfs2: Skip check for mandatory locks when unlocking
The nfs bug fixed by 0800c5f7a499a8961c3868e95cc4cf1715166457 and the 9p bug fixed by f78233dd44a110c574fe760ad6f9c1e8741a0d00 and the gfs2 bug fixed by 720e7749279bde0d08684b1bb4e7a2eedeec6394
also needs to be fixed for ocfs2. This patch does that.
Hopefully this is the last filesystem with this bug :-)
fs/ocfs2/locks.c +2 -1
@@ -113,7 +113,8 @@ int ocfs2_flock(struct file *file, int cmd, struct file_lock *fl)if (!(fl->fl_flags &FL_FLOCK ))return -ENOLCK ; -if (__mandatory_lock (inode)) +if (__mandatory_lock (inode) && + fl->fl_type !=F_UNLCK )return -ENOLCK ; if ((osb->s_mount_opt & OCFS2_MOUNT_LOCALFLOCKS) ||
Quoted 17 lines · Neil Brown
The nfs bug fixed by
0800c5f7a499a8961c3868e95cc4cf1715166457and the 9p bug fixed byf78233dd44a110c574fe760ad6f9c1e8741a0d00and the gfs2 bug fixed by720e7749279bde0d08684b1bb4e7a2eedeec6394also needs to be fixed for ocfs2. This patch does that.
Hopefully this is the last filesystem with this bug :-)
Signed-off-by NeilBrown <[email protected]>fs/ocfs2/locks.c +0
-0
fs/ocfs2/locks.c int ocfs2_flock(struct file *file, int cmd, struct file_lock *fl) · line 117
Quoted 6 lines
fs/ocfs2/locks.c +2
-1@@ -113,7 +113,8 @@ int ocfs2_flock(struct file *file, int cmd, struct file_lock *fl)if (!(fl->fl_flags &FL_FLOCK ))return -ENOLCK ; -if (__mandatory_lock (inode)) +if (__mandatory_lock (inode) && + fl->fl_type !=F_UNLCK )
If you reverse the order of these then you'd optimize away the call to __mandatory_lock(inode). As it is now, it will call it but then ignore the return if == F_UNLCK.
fs/ocfs2/locks.c int ocfs2_flock(struct file *file, int cmd, struct file_lock *fl)
Quoted 4 lines
fs/ocfs2/locks.c +0
-1return -ENOLCK ; if ((osb->s_mount_opt & OCFS2_MOUNT_LOCALFLOCKS) || --
Boaz