Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xfs: merge xfs_showargs into xfs_fs_show_options

No need for a trivial wrapper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

authored by

Christoph Hellwig and committed by
Darrick J. Wong
21f55993 1775c506

+7 -13
+7 -13
fs/xfs/xfs_super.c
··· 406 406 char *str; 407 407 }; 408 408 409 - STATIC void 410 - xfs_showargs( 411 - struct xfs_mount *mp, 412 - struct seq_file *m) 409 + static int 410 + xfs_fs_show_options( 411 + struct seq_file *m, 412 + struct dentry *root) 413 413 { 414 414 static struct proc_xfs_info xfs_info_set[] = { 415 415 /* the few simple ones we can get from the mount struct */ ··· 427 427 { XFS_MOUNT_DAX, ",dax" }, 428 428 { 0, NULL } 429 429 }; 430 + struct xfs_mount *mp = XFS_M(root->d_sb); 430 431 struct proc_xfs_info *xfs_infop; 431 432 432 433 for (xfs_infop = xfs_info_set; xfs_infop->flag; xfs_infop++) { ··· 479 478 480 479 if (!(mp->m_qflags & XFS_ALL_QUOTA_ACCT)) 481 480 seq_puts(m, ",noquota"); 481 + 482 + return 0; 482 483 } 483 484 484 485 static uint64_t ··· 1378 1375 xfs_restore_resvblks(mp); 1379 1376 xfs_log_work_queue(mp); 1380 1377 xfs_start_block_reaping(mp); 1381 - return 0; 1382 - } 1383 - 1384 - STATIC int 1385 - xfs_fs_show_options( 1386 - struct seq_file *m, 1387 - struct dentry *root) 1388 - { 1389 - xfs_showargs(XFS_M(root->d_sb), m); 1390 1378 return 0; 1391 1379 } 1392 1380