xfs
[Top] [All Lists]

Re: [PATCH 13/19] mkfs: encode conflicts into parsing table

To: xfs@xxxxxxxxxxx
Subject: Re: [PATCH 13/19] mkfs: encode conflicts into parsing table
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Mon, 2 May 2016 18:11:01 -0500
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1461231593-31294-14-git-send-email-jtulak@xxxxxxxxxx>
References: <1461231593-31294-1-git-send-email-jtulak@xxxxxxxxxx> <1461231593-31294-14-git-send-email-jtulak@xxxxxxxxxx>
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.0
Remove now-encoded conflict under case L_FILE

The .conflicts handle this now, no need to keep it around.

Eric Sandeen <sandeen@xxxxxxxxxx>: remove explicit L_FILE conflict

---
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 03d3c06..cdc81a9 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -1867,9 +1867,6 @@ main(
                                case L_FILE:
                                        xi.lisfile = getnum(value, &lopts,
                                                            L_FILE);
-                                       if (xi.lisfile && loginternal)
-                                               conflict('l', subopts, 
L_INTERNAL,
-                                                        L_FILE);
                                        if (xi.lisfile)
                                                xi.lcreat = 1;
                                        break;


<Prev in Thread] Current Thread [Next in Thread>