From patchwork Thu Sep 29 23:38:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikitas Angelinas X-Patchwork-Id: 117011 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3C7851007D4 for ; Fri, 30 Sep 2011 09:37:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758062Ab1I2Xh4 (ORCPT ); Thu, 29 Sep 2011 19:37:56 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:33454 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756789Ab1I2Xhy (ORCPT ); Thu, 29 Sep 2011 19:37:54 -0400 Received: by mail-bw0-f46.google.com with SMTP id zt4so1191106bkb.19 for ; Thu, 29 Sep 2011 16:37:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=DmCMt7rPUnIHzACVVxOPo1szaOng/RdTCAWH3hGSITo=; b=tOeaHvIVP++AFH+nfNFPgKMGIltTTyz2r8dztdl4f8TG7g6Sv/i1LxDgd1+0GZFi+Z xeyVe8xVkFRh9Cg4PoVMy6Fe0qv6pgD6erZ6nFzImzLrKPCBaff0hWVXaKj3mkD9/cll F3Ezub+BWYUaqbfzOKpZC40krkDZeTaGBGjsU= Received: by 10.204.13.151 with SMTP id c23mr4307975bka.291.1317339473890; Thu, 29 Sep 2011 16:37:53 -0700 (PDT) Received: from localhost.localdomain (cpc7-pmth9-2-0-cust111.6-1.cable.virginmedia.com. [86.24.138.112]) by mx.google.com with ESMTPS id s12sm3122091bkt.4.2011.09.29.16.37.52 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 29 Sep 2011 16:37:53 -0700 (PDT) From: Nikitas Angelinas To: tytso@mit.edu, adilger.kernel@dilger.ca, adilger@whamcloud.com, johann@whamcloud.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, nikitas_angelinas@xyratex.com, andrew_perepechko@xyratex.com, nikitasangelinas@gmail.com Subject: [PATCH 1/2] ext4: MMP: kmmpd should use nodename from init_uts_ns.name, not sysname Date: Fri, 30 Sep 2011 00:38:19 +0100 Message-Id: <1317339500-4341-2-git-send-email-nikitas_angelinas@xyratex.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1317339500-4341-1-git-send-email-nikitas_angelinas@xyratex.com> References: <1316737389-5522-1-git-send-email-nikitas_angelinas@xyratex.com> <1317339500-4341-1-git-send-email-nikitas_angelinas@xyratex.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org sysname holds "Linux" by default, i.e. what appears when doing a "uname -s"; nodename should be used to print the machine's hostname, i.e. what is returned when doing a "uname -n" or "hostname", and what gethostname(2)/sethostname(2) manipulate, in order to notify the administrator of the node which is contending to mount the filesystem. Signed-off-by: Nikitas Angelinas Signed-off-by: Andrew Perepechko Acked-by: Andreas Dilger --- fs/ext4/mmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c index 9bdef3f..2fca64e 100644 --- a/fs/ext4/mmp.c +++ b/fs/ext4/mmp.c @@ -109,7 +109,7 @@ static int kmmpd(void *data) mmp->mmp_check_interval = cpu_to_le16(mmp_check_interval); bdevname(bh->b_bdev, mmp->mmp_bdevname); - memcpy(mmp->mmp_nodename, init_utsname()->sysname, + memcpy(mmp->mmp_nodename, init_utsname()->nodename, sizeof(mmp->mmp_nodename)); while (!kthread_should_stop()) {