summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Kennedy2008-07-12 02:20:49 +0200
committerJ. Bruce Fields2008-07-13 23:22:24 +0200
commitafc1246f917c664b0df98b3c22fa62db74d2ca33 (patch)
tree6845972ea8f939cde7569264a63cd788d68e5e69
parentnfsd: take file and mnt write in nfs4_upgrade_open (diff)
downloadkernel-qcow2-linux-afc1246f917c664b0df98b3c22fa62db74d2ca33.tar.gz
kernel-qcow2-linux-afc1246f917c664b0df98b3c22fa62db74d2ca33.tar.xz
kernel-qcow2-linux-afc1246f917c664b0df98b3c22fa62db74d2ca33.zip
file lock: reorder struct file_lock to save space on 64 bit builds
Reduce sizeof struct file_lock by 8 on 64 bit builds allowing +1 objects per slab in the file_lock_cache Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--include/linux/fs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7c1080826832..87f89bd0f6ee 100644
--- a/include/linux/fs.h
+++ b/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;