Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a102b09 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: remove individual gfp constants for each metadata file 



This gets rid of NILFS_CPFILE_GFP, NILFS_SUFILE_GFP, NILFS_DAT_GFP,
and NILFS_IFILE_GFP.  All of these constants refer to NILFS_MDT_GFP,
and can be removed.

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 3218929d

fs/nilfs2/cpfile.h

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#include <linux/buffer_head.h>

#include <linux/nilfs2_fs.h>



#define NILFS_CPFILE_GFP	NILFS_MDT_GFP





int nilfs_cpfile_get_checkpoint(struct inode *, __u64, int,

				struct nilfs_checkpoint **,

fs/nilfs2/dat.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/buffer_head.h>

#include <linux/fs.h>



#define NILFS_DAT_GFP	NILFS_MDT_GFP



struct nilfs_palloc_req;

fs/nilfs2/ifile.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "mdt.h"

#include "alloc.h"



#define NILFS_IFILE_GFP  NILFS_MDT_GFP



static inline struct nilfs_inode *

nilfs_ifile_map_inode(struct inode *ifile, ino_t ino, struct buffer_head *ibh)

fs/nilfs2/mdt.c

+3 −2
Original line number Diff line number Diff line
@@ -513,9 +513,10 @@ nilfs_mdt_new_common(struct the_nilfs *nilfs, struct super_block *sb, 
}



struct inode *nilfs_mdt_new(struct the_nilfs *nilfs, struct super_block *sb,

			    ino_t ino, gfp_t gfp_mask)

			    ino_t ino)

{

	struct inode *inode = nilfs_mdt_new_common(nilfs, sb, ino, gfp_mask);

	struct inode *inode = nilfs_mdt_new_common(nilfs, sb, ino,

						   NILFS_MDT_GFP);



	if (!inode)

		return NULL;

fs/nilfs2/mdt.h

+1 −2
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ int nilfs_mdt_forget_block(struct inode *, unsigned long); 
int nilfs_mdt_mark_block_dirty(struct inode *, unsigned long);

int nilfs_mdt_fetch_dirty(struct inode *);



struct inode *nilfs_mdt_new(struct the_nilfs *, struct super_block *, ino_t,

			    gfp_t);

struct inode *nilfs_mdt_new(struct the_nilfs *, struct super_block *, ino_t);

struct inode *nilfs_mdt_new_common(struct the_nilfs *, struct super_block *,

				   ino_t, gfp_t);

void nilfs_mdt_destroy(struct inode *);