Commit 9b852342 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

vfs: move __sb_{start,end}_write* to fs.h 



Now that we've straightened out the callers, move these three functions
to fs.h since they're fairly trivial.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 8a3c84b6

fs/super.c

+0 −30
Original line number Diff line number Diff line
@@ -1631,36 +1631,6 @@ int super_setup_bdi(struct super_block *sb) 
}

EXPORT_SYMBOL(super_setup_bdi);



/*

 * This is an internal function, please use sb_end_{write,pagefault,intwrite}

 * instead.

 */

void __sb_end_write(struct super_block *sb, int level)

{

	percpu_up_read(sb->s_writers.rw_sem + level-1);

}

EXPORT_SYMBOL(__sb_end_write);



/*

 * This is an internal function, please use sb_start_{write,pagefault,intwrite}

 * instead.

 */

void __sb_start_write(struct super_block *sb, int level)

{

	percpu_down_read(sb->s_writers.rw_sem + level - 1);

}

EXPORT_SYMBOL(__sb_start_write);



/*

 * This is an internal function, please use sb_start_{write,pagefault,intwrite}

 * instead.

 */

bool __sb_start_write_trylock(struct super_block *sb, int level)

{

	return percpu_down_read_trylock(sb->s_writers.rw_sem + level - 1);

}

EXPORT_SYMBOL_GPL(__sb_start_write_trylock);



/**

 * sb_wait_write - wait until all writers to given file system finish

 * @sb: the super for which we wait

include/linux/fs.h

+18 −3
Original line number Diff line number Diff line
@@ -1580,9 +1580,24 @@ extern struct timespec64 current_time(struct inode *inode); 
 * Snapshotting support.

 */



void __sb_end_write(struct super_block *sb, int level);

void __sb_start_write(struct super_block *sb, int level);

bool __sb_start_write_trylock(struct super_block *sb, int level);

/*

 * These are internal functions, please use sb_start_{write,pagefault,intwrite}

 * instead.

 */

static inline void __sb_end_write(struct super_block *sb, int level)

{

	percpu_up_read(sb->s_writers.rw_sem + level-1);

}



static inline void __sb_start_write(struct super_block *sb, int level)

{

	percpu_down_read(sb->s_writers.rw_sem + level - 1);

}



static inline bool __sb_start_write_trylock(struct super_block *sb, int level)

{

	return percpu_down_read_trylock(sb->s_writers.rw_sem + level - 1);

}



#define __sb_writers_acquired(sb, lev)	\

	percpu_rwsem_acquire(&(sb)->s_writers.rw_sem[(lev)-1], 1, _THIS_IP_)

CRA Git | Maintained and supported by SUSTech CRA and CCSE