From: Tobias Geerinckx-Rice via Guix-patches via <guix-patches@gnu.org>
To: 38860@debbugs.gnu.org
Subject: [bug#38860] [PATCH 1/7] file-systems: Add support for JFS.
Date: Thu, 2 Jan 2020 01:38:56 +0100 [thread overview]
Message-ID: <20200102003902.15205-1-me@tobias.gr> (raw)
In-Reply-To: <87r20ivh15.fsf@nckx>
* gnu/build/file-systems.scm (%jfs-endianness): New syntax.
(jfs-superblock?, read-jfs-superblock, jfs-superblock-uuid)
(jfs-superblock-volume-name, check-jfs-file-system): New procedures.
(%partition-label-readers, %partition-uuid-readers, check-file-system):
Register them.
---
gnu/build/file-systems.scm | 49 ++++++++++++++++++++++++++++++++++++--
1 file changed, 47 insertions(+), 2 deletions(-)
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index 13c44aa728..9299cc2e4c 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2016, 2017 David Craven <david@craven.ch>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -294,6 +295,45 @@ string. Trailing spaces are trimmed."
(string-trim-right (latin1->string (sub-bytevector sblock 40 32)
(lambda (c) #f)) #\space))
+\f
+;;;
+;;; JFS file systems.
+;;;
+
+;; Taken from <linux-libre>/fs/jfs/jfs_superblock.h.
+
+(define-syntax %jfs-endianness
+ ;; Endianness of JFS file systems.
+ (identifier-syntax (endianness little)))
+
+(define (jfs-superblock? sblock)
+ "Return #t when SBLOCK is a JFS superblock."
+ (bytevector=? (sub-bytevector sblock 0 4)
+ (string->utf8 "JFS1")))
+
+(define (read-jfs-superblock device)
+ "Return the raw contents of DEVICE's JFS superblock as a bytevector, or #f
+if DEVICE does not contain a JFS file system."
+ (read-superblock device 32768 184 jfs-superblock?))
+
+(define (jfs-superblock-uuid sblock)
+ "Return the UUID of JFS superblock SBLOCK as a 16-byte bytevector."
+ (sub-bytevector sblock 136 16))
+
+(define (jfs-superblock-volume-name sblock)
+ "Return the volume name of SBLOCK as a string of at most 16 characters, or
+#f if SBLOCK has no volume name."
+ (null-terminated-latin1->string (sub-bytevector sblock 152 16)))
+
+(define (check-jfs-file-system device)
+ "Return the health of a JFS file system on DEVICE."
+ (match (status:exit-val
+ (system* "jfs_fsck" "-p" "-v" device))
+ (0 'pass)
+ (1 'errors-corrected)
+ (2 'reboot-required)
+ (_ 'fatal-error)))
+
\f
;;;
;;; LUKS encrypted devices.
@@ -420,7 +460,9 @@ partition field reader that returned a value."
(partition-field-reader read-fat32-superblock
fat32-superblock-volume-name)
(partition-field-reader read-fat16-superblock
- fat16-superblock-volume-name)))
+ fat16-superblock-volume-name)
+ (partition-field-reader read-jfs-superblock
+ jfs-superblock-volume-name)))
(define %partition-uuid-readers
(list (partition-field-reader read-iso9660-superblock
@@ -432,7 +474,9 @@ partition field reader that returned a value."
(partition-field-reader read-fat32-superblock
fat32-superblock-uuid)
(partition-field-reader read-fat16-superblock
- fat16-superblock-uuid)))
+ fat16-superblock-uuid)
+ (partition-field-reader read-jfs-superblock
+ jfs-superblock-uuid)))
(define read-partition-label
(cut read-partition-field <> %partition-label-readers))
@@ -527,6 +571,7 @@ were found."
((string-prefix? "ext" type) check-ext2-file-system)
((string-prefix? "btrfs" type) check-btrfs-file-system)
((string-suffix? "fat" type) check-fat-file-system)
+ ((string-prefix? "jfs" type) check-jfs-file-system)
(else #f)))
(if check-procedure
--
2.23.0
next prev parent reply other threads:[~2020-01-02 0:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 0:27 [bug#38860] Support JFS! Tobias Geerinckx-Rice via Guix-patches via
2020-01-02 0:38 ` Tobias Geerinckx-Rice via Guix-patches via [this message]
2020-01-02 0:38 ` [bug#38860] [PATCH 2/7] uuid: Add support for JFS Tobias Geerinckx-Rice via Guix-patches via
2020-01-02 0:38 ` [bug#38860] [PATCH 3/7] gnu: Add jfsutils-static Tobias Geerinckx-Rice via Guix-patches via
2020-01-02 0:38 ` [bug#38860] [PATCH 4/7] gnu: Add jfs_fsck-static Tobias Geerinckx-Rice via Guix-patches via
2020-01-02 0:39 ` [bug#38860] [PATCH 5/7] linux-initrd: Add support for JFS Tobias Geerinckx-Rice via Guix-patches via
2020-01-02 0:39 ` [bug#38860] [PATCH 6/7] tests: install: Test a JFS root file system Tobias Geerinckx-Rice via Guix-patches via
2020-01-02 0:39 ` [bug#38860] [PATCH 7/7] install: Add jfsutils to the installation image Tobias Geerinckx-Rice via Guix-patches via
2020-01-02 14:35 ` [bug#38860] Support JFS! Danny Milosavljevic
2020-01-03 12:56 ` bug#38860: " Tobias Geerinckx-Rice via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200102003902.15205-1-me@tobias.gr \
--to=guix-patches@gnu.org \
--cc=38860@debbugs.gnu.org \
--cc=me@tobias.gr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.