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

Commit 47e4491b authored by Al Viro's avatar Al Viro
Browse files

Cleanup after commit 585d3bc0 



fsync_bdev() export and a bunch of stubs for !CONFIG_BLOCK case had
been left behind

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e5824c97

fs/block_dev.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -204,6 +204,7 @@ int fsync_bdev(struct block_device *bdev) 
	}

	}

	return sync_blockdev(bdev);

	return sync_blockdev(bdev);

}

}

EXPORT_SYMBOL(fsync_bdev);





/**

/**

 * freeze_bdev  --  lock a filesystem and force it into a consistent state

 * freeze_bdev  --  lock a filesystem and force it into a consistent state

fs/buffer.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -3281,7 +3281,6 @@ EXPORT_SYMBOL(cont_write_begin); 
EXPORT_SYMBOL(end_buffer_read_sync);

EXPORT_SYMBOL(end_buffer_read_sync);

EXPORT_SYMBOL(end_buffer_write_sync);

EXPORT_SYMBOL(end_buffer_write_sync);

EXPORT_SYMBOL(file_fsync);

EXPORT_SYMBOL(file_fsync);

EXPORT_SYMBOL(fsync_bdev);

EXPORT_SYMBOL(generic_block_bmap);

EXPORT_SYMBOL(generic_block_bmap);

EXPORT_SYMBOL(generic_cont_expand_simple);

EXPORT_SYMBOL(generic_cont_expand_simple);

EXPORT_SYMBOL(init_buffer);

EXPORT_SYMBOL(init_buffer);

include/linux/buffer_head.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -332,22 +332,10 @@ extern int __set_page_dirty_buffers(struct page *page); 




static inline void buffer_init(void) {}

static inline void buffer_init(void) {}

static inline int try_to_free_buffers(struct page *page) { return 1; }

static inline int try_to_free_buffers(struct page *page) { return 1; }

static inline int sync_blockdev(struct block_device *bdev) { return 0; }

static inline int inode_has_buffers(struct inode *inode) { return 0; }

static inline int inode_has_buffers(struct inode *inode) { return 0; }

static inline void invalidate_inode_buffers(struct inode *inode) {}

static inline void invalidate_inode_buffers(struct inode *inode) {}

static inline int remove_inode_buffers(struct inode *inode) { return 1; }

static inline int remove_inode_buffers(struct inode *inode) { return 1; }

static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }

static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; }

static inline void invalidate_bdev(struct block_device *bdev) {}



static inline struct super_block *freeze_bdev(struct block_device *sb)

{

	return NULL;

}



static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb)

{

	return 0;

}





#endif /* CONFIG_BLOCK */

#endif /* CONFIG_BLOCK */

#endif /* _LINUX_BUFFER_HEAD_H */
 
#endif /* _LINUX_BUFFER_HEAD_H */

include/linux/fs.h

+12 −0
Original line number Original line Diff line number Diff line
@@ -1886,6 +1886,18 @@ extern int fsync_super(struct super_block *); 
extern int fsync_no_super(struct block_device *);

extern int fsync_no_super(struct block_device *);

#else

#else

static inline void bd_forget(struct inode *inode) {}

static inline void bd_forget(struct inode *inode) {}

static inline int sync_blockdev(struct block_device *bdev) { return 0; }

static inline void invalidate_bdev(struct block_device *bdev) {}



static inline struct super_block *freeze_bdev(struct block_device *sb)

{

	return NULL;

}



static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb)

{

	return 0;

}

#endif

#endif

extern const struct file_operations def_blk_fops;

extern const struct file_operations def_blk_fops;

extern const struct file_operations def_chr_fops;

extern const struct file_operations def_chr_fops;