diff mbox

[2/4] SQUASHME: pnfs: fix lseg ordering

Message ID 1305554371-29159-1-git-send-email-bhalevy@panasas.com (mailing list archive)
State New, archived
Headers show

Commit Message

Benny Halevy May 16, 2011, 1:59 p.m. UTC 
As noted by Fred Isaman, we prefer seeing the longer lsegs to the shorter.
Otherwise, we prefer seeing RW lsegs to RO ones.

Signed-off-by: Benny Halevy <bhalevy@panasas.com>
---
 fs/nfs/pnfs.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 589989d..9d41cab 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -686,19 +686,18 @@  cmp_layout(struct pnfs_layout_range *l1,
 {
 	s64 d;
 
-	/* higher offset > lower offset */
+	/* high offset > low offset */
 	d = l1->offset - l2->offset;
 	if (d)
 		return d;
 
-	/* longer length > shorter length */
-	d = l1->length - l2->length;
+	/* short length > long length */
+	d = l2->length - l1->length;
 	if (d)
 		return d;
 
 	/* read > read/write */
-	return (int)(l2->iomode == IOMODE_READ) -
-		(int)(l1->iomode == IOMODE_READ);
+	return (int)(l1->iomode == IOMODE_READ) - (int)(l2->iomode == IOMODE_READ);
 }
 
 static void