From d850017a8eacb059b4a9f988dfd33ddf8b1e754d Mon Sep 17 00:00:00 2001 From: Richard Kennedy Date: Fri, 11 Jul 2008 17:20:49 -0700 Subject: [PATCH] --- yaml --- r: 104124 b: refs/heads/master c: afc1246f917c664b0df98b3c22fa62db74d2ca33 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/fs.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a124dc31396c..c910ff06fa52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e518f0560a191269bd345178c899c790eb1ad4c8 +refs/heads/master: afc1246f917c664b0df98b3c22fa62db74d2ca33 diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 7c1080826832..87f89bd0f6ee 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -917,12 +917,12 @@ struct file_lock { struct list_head fl_link; /* doubly linked list of all locks */ struct list_head fl_block; /* circular list of blocked processes */ fl_owner_t fl_owner; + unsigned char fl_flags; + unsigned char fl_type; unsigned int fl_pid; struct pid *fl_nspid; wait_queue_head_t fl_wait; struct file *fl_file; - unsigned char fl_flags; - unsigned char fl_type; loff_t fl_start; loff_t fl_end;