From 90bd9782831f9d3a3c7c682f9cc04ccef0a1666d Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 4 Oct 2015 16:04:25 +0200
Subject: truncate: Fix bug that caused xfstests generic/030 to fail

The bug was caused by using cipherOff where plainOff should
have been used.
Renamed the symbols for less confusion.
---
 pathfs_frontend/file.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'pathfs_frontend')

diff --git a/pathfs_frontend/file.go b/pathfs_frontend/file.go
index b328b61..697d58d 100644
--- a/pathfs_frontend/file.go
+++ b/pathfs_frontend/file.go
@@ -270,29 +270,30 @@ func (f *file) Truncate(newSize uint64) fuse.Status {
 			}
 		}
 		return fuse.OK
-		// File shrinks
 	} else {
+		// File shrinks
 		blockNo := f.cfs.BlockNoPlainOff(newSize)
-		lastBlockOff := blockNo * f.cfs.CipherBS()
-		lastBlockLen := newSize - blockNo * f.cfs.PlainBS()
+		cipherOff := blockNo * f.cfs.CipherBS()
+		plainOff := blockNo * f.cfs.PlainBS()
+		lastBlockLen := newSize - plainOff
 		var data []byte
 		if lastBlockLen > 0 {
 			var status fuse.Status
-			data, status = f.doRead(lastBlockOff, lastBlockLen)
+			data, status = f.doRead(plainOff, lastBlockLen)
 			if status != fuse.OK {
 				cryptfs.Warn.Printf("shrink doRead returned error: %v", err)
 				return status
 			}
 		}
 		f.lock.Lock()
-		err = syscall.Ftruncate(int(f.fd.Fd()), int64(lastBlockOff))
+		err = syscall.Ftruncate(int(f.fd.Fd()), int64(cipherOff))
 		f.lock.Unlock()
 		if err != nil {
 			cryptfs.Warn.Printf("shrink Ftruncate returned error: %v", err)
 			return fuse.ToStatus(err)
 		}
 		if lastBlockLen > 0 {
-			_, status := f.doWrite(data, int64(lastBlockOff))
+			_, status := f.doWrite(data, int64(plainOff))
 			return status
 		}
 		return fuse.OK
-- 
cgit v1.2.3