[PATCH 05/12] ocfs2: properly initial file_lock used for unlock.

[NeilBrown]

Rather than assuming all-zeros is sufficient, use the available API to
initialize the file_lock structure use for unlock.  VFS-level changes
will soon make it important that the list_heads in file_lock are
always properly initialized.

Signed-off-by: NeilBrown 
Reviewed-by: J. Bruce Fields 
---
 fs/ocfs2/locks.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c
index d56f0079b858..b11acd34001a 100644
--- a/fs/ocfs2/locks.c
+++ b/fs/ocfs2/locks.c
@@ -52,6 +52,7 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
if (lockres->l_flags & OCFS2_LOCK_ATTACHED &&
lockres->l_level > LKM_NLMODE) {
int old_level = 0;
+   struct file_lock request;
 
if (lockres->l_level == LKM_EXMODE)
old_level = 1;
@@ -66,11 +67,10 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
 * level.
 */
 
-   locks_lock_file_wait(file,
-   &(struct file_lock) {
-   .fl_type = F_UNLCK,
-   .fl_flags = FL_FLOCK
-   });
+   locks_init_lock();
+   request.fl_type = F_UNLCK;
+   request.fl_flags = FL_FLOCK;
+   locks_lock_file_wait(file, );
 
ocfs2_file_unlock(file);
}

[PATCH 05/12] ocfs2: properly initial file_lock used for unlock.

[NeilBrown]

Rather than assuming all-zeros is sufficient, use the available API to
initialize the file_lock structure use for unlock.  VFS-level changes
will soon make it important that the list_heads in file_lock are
always properly initialized.

Signed-off-by: NeilBrown 
Reviewed-by: J. Bruce Fields 
---
 fs/ocfs2/locks.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c
index d56f0079b858..b11acd34001a 100644
--- a/fs/ocfs2/locks.c
+++ b/fs/ocfs2/locks.c
@@ -52,6 +52,7 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
if (lockres->l_flags & OCFS2_LOCK_ATTACHED &&
lockres->l_level > LKM_NLMODE) {
int old_level = 0;
+   struct file_lock request;
 
if (lockres->l_level == LKM_EXMODE)
old_level = 1;
@@ -66,11 +67,10 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
 * level.
 */
 
-   locks_lock_file_wait(file,
-   &(struct file_lock) {
-   .fl_type = F_UNLCK,
-   .fl_flags = FL_FLOCK
-   });
+   locks_init_lock();
+   request.fl_type = F_UNLCK;
+   request.fl_flags = FL_FLOCK;
+   locks_lock_file_wait(file, );
 
ocfs2_file_unlock(file);
}

[PATCH 05/12] ocfs2: properly initial file_lock used for unlock.

[NeilBrown]

Rather than assuming all-zeros is sufficient, use the available API to
initialize the file_lock structure use for unlock.
VFS-level changes will soon make it important that the
list_heads in file_lock are always properly initialized.

Signed-off-by: NeilBrown 
---
 fs/ocfs2/locks.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c
index d56f0079b858..b11acd34001a 100644
--- a/fs/ocfs2/locks.c
+++ b/fs/ocfs2/locks.c
@@ -52,6 +52,7 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
if (lockres->l_flags & OCFS2_LOCK_ATTACHED &&
lockres->l_level > LKM_NLMODE) {
int old_level = 0;
+   struct file_lock request;
 
if (lockres->l_level == LKM_EXMODE)
old_level = 1;
@@ -66,11 +67,10 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
 * level.
 */
 
-   locks_lock_file_wait(file,
-   &(struct file_lock) {
-   .fl_type = F_UNLCK,
-   .fl_flags = FL_FLOCK
-   });
+   locks_init_lock();
+   request.fl_type = F_UNLCK;
+   request.fl_flags = FL_FLOCK;
+   locks_lock_file_wait(file, );
 
ocfs2_file_unlock(file);
}

[PATCH 05/12] ocfs2: properly initial file_lock used for unlock.

[NeilBrown]

Rather than assuming all-zeros is sufficient, use the available API to
initialize the file_lock structure use for unlock.
VFS-level changes will soon make it important that the
list_heads in file_lock are always properly initialized.

Signed-off-by: NeilBrown 
---
 fs/ocfs2/locks.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c
index d56f0079b858..b11acd34001a 100644
--- a/fs/ocfs2/locks.c
+++ b/fs/ocfs2/locks.c
@@ -52,6 +52,7 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
if (lockres->l_flags & OCFS2_LOCK_ATTACHED &&
lockres->l_level > LKM_NLMODE) {
int old_level = 0;
+   struct file_lock request;
 
if (lockres->l_level == LKM_EXMODE)
old_level = 1;
@@ -66,11 +67,10 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
 * level.
 */
 
-   locks_lock_file_wait(file,
-   &(struct file_lock) {
-   .fl_type = F_UNLCK,
-   .fl_flags = FL_FLOCK
-   });
+   locks_init_lock();
+   request.fl_type = F_UNLCK;
+   request.fl_flags = FL_FLOCK;
+   locks_lock_file_wait(file, );
 
ocfs2_file_unlock(file);
}

[PATCH 05/12] ocfs2: properly initial file_lock used for unlock.

[NeilBrown]

Rather than assuming all-zeros is sufficient, use the available API to
initialize the file_lock structure use for unlock.
VFS-level changes will soon make it important that the
list_heads in file_lock are always properly initialized.

Signed-off-by: NeilBrown 
---
 fs/ocfs2/locks.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c
index d56f0079b858..9bb978d57c7d 100644
--- a/fs/ocfs2/locks.c
+++ b/fs/ocfs2/locks.c
@@ -52,6 +52,7 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
if (lockres->l_flags & OCFS2_LOCK_ATTACHED &&
lockres->l_level > LKM_NLMODE) {
int old_level = 0;
+   struct file_lock request;
 
if (lockres->l_level == LKM_EXMODE)
old_level = 1;
@@ -66,11 +67,10 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
 * level.
 */
 
-   locks_lock_file_wait(file,
-   &(struct file_lock) {
-   .fl_type = F_UNLCK,
-   .fl_flags = FL_FLOCK
-   });
+   locks_init_lock();
+   request.fl_type = F_UNLOCK;
+   request.fl_flags = FL_FLOCK;
+   locks_lock_file_wait(file, );
 
ocfs2_file_unlock(file);
}

[PATCH 05/12] ocfs2: properly initial file_lock used for unlock.

[NeilBrown]

Rather than assuming all-zeros is sufficient, use the available API to
initialize the file_lock structure use for unlock.
VFS-level changes will soon make it important that the
list_heads in file_lock are always properly initialized.

Signed-off-by: NeilBrown 
---
 fs/ocfs2/locks.c |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/ocfs2/locks.c b/fs/ocfs2/locks.c
index d56f0079b858..9bb978d57c7d 100644
--- a/fs/ocfs2/locks.c
+++ b/fs/ocfs2/locks.c
@@ -52,6 +52,7 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
if (lockres->l_flags & OCFS2_LOCK_ATTACHED &&
lockres->l_level > LKM_NLMODE) {
int old_level = 0;
+   struct file_lock request;
 
if (lockres->l_level == LKM_EXMODE)
old_level = 1;
@@ -66,11 +67,10 @@ static int ocfs2_do_flock(struct file *file, struct inode 
*inode,
 * level.
 */
 
-   locks_lock_file_wait(file,
-   &(struct file_lock) {
-   .fl_type = F_UNLCK,
-   .fl_flags = FL_FLOCK
-   });
+   locks_init_lock();
+   request.fl_type = F_UNLOCK;
+   request.fl_flags = FL_FLOCK;
+   locks_lock_file_wait(file, );
 
ocfs2_file_unlock(file);
}