Commit af5df566 authored by Steven Whitehouse's avatar Steven Whitehouse Committed by Al Viro
Browse files

vfs: Further changes from macro to inline function in fs.h 



There is a second set of macros for when CONFIG_FILE_LOCKING is
not set. This patch updates those to become inline functions
as well.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c2aca5e5

include/linux/fs.h

+38 −7
Original line number Diff line number Diff line
@@ -1800,13 +1800,44 @@ static inline int break_lease(struct inode *inode, unsigned int mode) 
	return 0;

}

#else /* !CONFIG_FILE_LOCKING */

#define locks_mandatory_locked(a) ({ 0; })

#define locks_mandatory_area(a, b, c, d, e) ({ 0; })

#define __mandatory_lock(a) ({ 0; })

#define mandatory_lock(a) ({ 0; })

#define locks_verify_locked(a) ({ 0; })

#define locks_verify_truncate(a, b, c) ({ 0; })

#define break_lease(a, b) ({ 0; })

static inline int locks_mandatory_locked(struct inode *inode)

{

	return 0;

}



static inline int locks_mandatory_area(int rw, struct inode *inode,

				       struct file *filp, loff_t offset,

				       size_t count)

{

	return 0;

}



static inline int __mandatory_lock(struct inode *inode)

{

	return 0;

}



static inline int mandatory_lock(struct inode *inode)

{

	return 0;

}



static inline int locks_verify_locked(struct inode *inode)

{

	return 0;

}



static inline int locks_verify_truncate(struct inode *inode, struct file *filp,

					size_t size)

{

	return 0;

}



static inline int break_lease(struct inode *inode, unsigned int mode)

{

	return 0;

}



#endif /* CONFIG_FILE_LOCKING */



/* fs/open.c */