drop xfs_version.h
PATCH 1/1 drop xfs_version.h
xfs_version.h is about 30 lines for the benefit of one single define, which seems a bit silly.
Just drop the file and hardcode "SGI XFS" the 2
places it's used.
---
fs/xfs/linux-2.6/xfs_version.h | 29 ------------------- linux-2.6/fs/xfs/linux-2.6/xfs_super.c | 5 +-- 2 files changed, 2 insertions(+), 32 deletions(-)
fs/xfs/linux-2.6/xfs_super.c +2 -3
@@ -48,7 +48,6 @@#include "xfs_buf_item.h" #include "xfs_utils.h" #include "xfs_vnodeops.h" -#include "xfs_version.h" #include "xfs_log_priv.h" #include "xfs_trans_priv.h" #include "xfs_filestream.h"
@@ -1788,7 +1787,7 @@ init_xfs_fs(void) {int error; - printk(KERN_INFO XFS_VERSION_STRING " with " +printk (KERN_INFO "SGI XFS with " XFS_BUILD_OPTIONS " enabled\n" );ktrace_init (64 );
@@ -1867,5 +1866,5 @@ module_init(init_xfs_fs);module_exit (exit_xfs_fs);MODULE_AUTHOR ("Silicon Graphics, Inc." ); -MODULE_DESCRIPTION (XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled" ); +MODULE_DESCRIPTION ("SGI XFS with " XFS_BUILD_OPTIONS " enabled" );MODULE_LICENSE ("GPL" );
fs/xfs/linux-2.6/xfs_version.h deleted +0 -29
@@ -1,29 +0,0 @@ -/* -* Copyright (c) 2001-2002,2005 Silicon Graphics, Inc. -* All Rights Reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it would be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write the Free Software Foundation, -* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ -#ifndef __XFS_VERSION_H__ -#define __XFS_VERSION_H__ - -/* -* Dummy file that can contain a timestamp to put into the -* XFS init string, to help users keep track of what they're -* running -*/ - -#define XFS_VERSION_STRING "SGI XFS" - -#endif /* __XFS_VERSION_H__ */
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
fs/xfs/linux-2.6/xfs_super.c init_xfs_fs(void) · line 1791
Quoted 11 lines · Eric Sandeen
xfs_version.his about 30 lines for the benefit of one single define, which seems a bit silly.Just drop the file and hardcode "SGI XFS" the 2
places it's used.Signed-off-by Eric Sandeen <[email protected]>fs/xfs/linux-2.6/xfs_super.c +1
-1- printk(KERN_INFO XFS_VERSION_STRING " with " +printk (KERN_INFO "SGI XFS with " XFS_BUILD_OPTIONS " enabled\n" );
To prove that I can nitpick about even the most trivial patch:
shouldn't this be merged into a single line now? :)
Otherwise looks good,
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 1/1 drop xfs_version.h
xfs_version.h is about 30 lines for the benefit of one single define, which seems a bit silly.
Just drop the file and hardcode "SGI XFS" the 2
places it's used.
v2: merge together 2 now-shorter lines.
---
fs/xfs/linux-2.6/xfs_version.h | 29 ----------------- linux-2.6/fs/xfs/linux-2.6/xfs_super.c | 6 +--- 2 files changed, 2 insertions(+), 33 deletions(-)
fs/xfs/linux-2.6/xfs_super.c +2 -4
@@ -48,7 +48,6 @@#include "xfs_buf_item.h" #include "xfs_utils.h" #include "xfs_vnodeops.h" -#include "xfs_version.h" #include "xfs_log_priv.h" #include "xfs_trans_priv.h" #include "xfs_filestream.h"
@@ -1788,8 +1787,7 @@ init_xfs_fs(void) {int error; - printk(KERN_INFO XFS_VERSION_STRING " with " - XFS_BUILD_OPTIONS " enabled\n"); +printk (KERN_INFO "SGI XFS with " XFS_BUILD_OPTIONS " enabled\n" );ktrace_init (64 );xfs_ioend_init ();
@@ -1867,5 +1865,5 @@ module_init(init_xfs_fs);module_exit (exit_xfs_fs);MODULE_AUTHOR ("Silicon Graphics, Inc." ); -MODULE_DESCRIPTION (XFS_VERSION_STRING " with " XFS_BUILD_OPTIONS " enabled" ); +MODULE_DESCRIPTION ("SGI XFS with " XFS_BUILD_OPTIONS " enabled" );MODULE_LICENSE ("GPL" );
fs/xfs/linux-2.6/xfs_version.h deleted +0 -29
@@ -1,29 +0,0 @@ -/* -* Copyright (c) 2001-2002,2005 Silicon Graphics, Inc. -* All Rights Reserved. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it would be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write the Free Software Foundation, -* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ -#ifndef __XFS_VERSION_H__ -#define __XFS_VERSION_H__ - -/* -* Dummy file that can contain a timestamp to put into the -* XFS init string, to help users keep track of what they're -* running -*/ - -#define XFS_VERSION_STRING "SGI XFS" - -#endif /* __XFS_VERSION_H__ */
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 9 lines · Eric Sandeen
xfs_version.his about 30 lines for the benefit of one single define, which seems a bit silly.Just drop the file and hardcode "SGI XFS" the 2
places it's used.v2: merge together 2 now-shorter lines.
Signed-off-by Eric Sandeen <[email protected]>
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs