aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/filesystems/ocfs2.txt2
-rw-r--r--fs/ocfs2/reservations.c7
-rw-r--r--fs/ocfs2/reservations.h2
3 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/filesystems/ocfs2.txt b/Documentation/filesystems/ocfs2.txt
index 412df9095937..32339e584a9a 100644
--- a/Documentation/filesystems/ocfs2.txt
+++ b/Documentation/filesystems/ocfs2.txt
@@ -80,6 +80,6 @@ user_xattr (*) Enables Extended User Attributes.
80nouser_xattr Disables Extended User Attributes. 80nouser_xattr Disables Extended User Attributes.
81acl Enables POSIX Access Control Lists support. 81acl Enables POSIX Access Control Lists support.
82noacl (*) Disables POSIX Access Control Lists support. 82noacl (*) Disables POSIX Access Control Lists support.
83resv_level=4 (*) Set how agressive allocation reservations will be. 83resv_level=2 (*) Set how agressive allocation reservations will be.
84 Valid values are between 0 (reservations off) to 8 84 Valid values are between 0 (reservations off) to 8
85 (maximum space for reservations). 85 (maximum space for reservations).
diff --git a/fs/ocfs2/reservations.c b/fs/ocfs2/reservations.c
index 7fc6cfee95f1..87fa35791f18 100644
--- a/fs/ocfs2/reservations.c
+++ b/fs/ocfs2/reservations.c
@@ -55,9 +55,10 @@ static unsigned int ocfs2_resv_window_bits(struct ocfs2_reservation_map *resmap,
55 if (!(resv->r_flags & OCFS2_RESV_FLAG_DIR)) { 55 if (!(resv->r_flags & OCFS2_RESV_FLAG_DIR)) {
56 /* 8, 16, 32, 64, 128, 256, 512, 1024 */ 56 /* 8, 16, 32, 64, 128, 256, 512, 1024 */
57 bits = 4 << osb->osb_resv_level; 57 bits = 4 << osb->osb_resv_level;
58 } else 58 } else {
59 bits = OCFS2_RESV_DIR_WINDOW_BITS; 59 /* For now, treat directories the same as files. */
60 60 bits = 4 << osb->osb_resv_level;
61 }
61 return bits; 62 return bits;
62} 63}
63 64
diff --git a/fs/ocfs2/reservations.h b/fs/ocfs2/reservations.h
index 34bb308375c5..022aff601e15 100644
--- a/fs/ocfs2/reservations.h
+++ b/fs/ocfs2/reservations.h
@@ -22,7 +22,7 @@
22 22
23#include <linux/rbtree.h> 23#include <linux/rbtree.h>
24 24
25#define OCFS2_DEFAULT_RESV_LEVEL 4 25#define OCFS2_DEFAULT_RESV_LEVEL 2
26#define OCFS2_MAX_RESV_LEVEL 9 26#define OCFS2_MAX_RESV_LEVEL 9
27#define OCFS2_MIN_RESV_LEVEL 0 27#define OCFS2_MIN_RESV_LEVEL 0
28 28