Util-Linux package development
 help / color / mirror / Atom feed
From: Davidlohr Bueso <dave@gnu.org>
To: Karel Zak <kzak@redhat.com>
Cc: util-linux <util-linux@vger.kernel.org>
Subject: [PATCH 2/5] lomount: avoid data duplication
Date: Mon, 26 Sep 2011 16:50:00 -0300	[thread overview]
Message-ID: <1317066600.2896.2.camel@offbook> (raw)
In-Reply-To: <1317066156.3401.1.camel@offbook>

From: Davidlohr Bueso <dave@gnu.org>
Date: Mon, 26 Sep 2011 14:57:13 -0300

In lib/loopdev.c we already define struct loop_info64 and the LO_FLAGS_* macros, so get rid of the local ones in loop.h

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
 mount/loop.h |   23 -----------------------
 1 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/mount/loop.h b/mount/loop.h
index 64df339..1700983 100644
--- a/mount/loop.h
+++ b/mount/loop.h
@@ -25,13 +25,6 @@
 /* #define LOOP_CHANGE_FD	0x4C06 */
 #define LOOP_SET_CAPACITY	0x4C07
 
-/* Flags for loop_into{64,}->lo_flags */
-enum {
-	LO_FLAGS_READ_ONLY  = 1,
-	LO_FLAGS_USE_AOPS   = 2,
-	LO_FLAGS_AUTOCLEAR  = 4, /* New in 2.6.25 */
-};
-
 #define LO_NAME_SIZE	64
 #define LO_KEY_SIZE	32
 
@@ -50,20 +43,4 @@ struct loop_info {
 	char		reserved[4];
 };
 
-struct loop_info64 {
-	uint64_t	lo_device;
-	uint64_t	lo_inode;
-	uint64_t	lo_rdevice;
-	uint64_t	lo_offset;
-	uint64_t	lo_sizelimit; /* bytes, 0 == max available */
-	uint32_t	lo_number;
-	uint32_t	lo_encrypt_type;
-	uint32_t	lo_encrypt_key_size;
-	uint32_t	lo_flags;
-	uint8_t		lo_file_name[LO_NAME_SIZE];
-	uint8_t		lo_crypt_name[LO_NAME_SIZE];
-	uint8_t		lo_encrypt_key[LO_KEY_SIZE];
-	uint64_t	lo_init[2];
-};
-
 #endif /* MNT_LOOP_H */
-- 
1.7.4.1

  parent reply	other threads:[~2011-09-26 19:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1317066156.3401.1.camel@offbook>
2011-09-26 19:49 ` [PATCH 1/5] lomount: accomodate building with loopdev Davidlohr Bueso
2011-09-26 19:50 ` Davidlohr Bueso [this message]
2011-09-26 19:50 ` [PATCH 3/5] lomount: rewrite find_unused_loop_devices() Davidlohr Bueso
2011-09-26 19:50 ` [PATCH 4/5] mount: remove is_loop_device() Davidlohr Bueso
2011-09-26 19:50 ` [PATCH 5/5] lomount: rewrite del_loop() Davidlohr Bueso

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=1317066600.2896.2.camel@offbook \
    --to=dave@gnu.org \
    --cc=kzak@redhat.com \
    --cc=util-linux@vger.kernel.org \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox