mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-04 04:06:26 +00:00
d_path pile
-----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQqUNBr3gm4hGXdBJlZ7Krx/gZQ6wUCYzxjQAAKCRBZ7Krx/gZQ 683pAP9oSHaXo3Twl6rweirNbHocgm8MynCgIU3bpzeVPi6Z1wEApfEq4IInWQyL R6ObOneoSobi+9Iaqsoe+uKu54MghAY= =rt7w -----END PGP SIGNATURE----- Merge tag 'pull-d_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull vfs d_path updates from Al Viro. * tag 'pull-d_path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: d_path.c: typo fix... dynamic_dname(): drop unused dentry argument
This commit is contained in:
commit
70df64d6c6
@ -53,7 +53,7 @@ static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen)
|
|||||||
ret = strlcpy(name, dmabuf->name, DMA_BUF_NAME_LEN);
|
ret = strlcpy(name, dmabuf->name, DMA_BUF_NAME_LEN);
|
||||||
spin_unlock(&dmabuf->name_lock);
|
spin_unlock(&dmabuf->name_lock);
|
||||||
|
|
||||||
return dynamic_dname(dentry, buffer, buflen, "/%s:%s",
|
return dynamic_dname(buffer, buflen, "/%s:%s",
|
||||||
dentry->d_name.name, ret > 0 ? name : "");
|
dentry->d_name.name, ret > 0 ? name : "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ static struct inode *anon_inode_inode;
|
|||||||
*/
|
*/
|
||||||
static char *anon_inodefs_dname(struct dentry *dentry, char *buffer, int buflen)
|
static char *anon_inodefs_dname(struct dentry *dentry, char *buffer, int buflen)
|
||||||
{
|
{
|
||||||
return dynamic_dname(dentry, buffer, buflen, "anon_inode:%s",
|
return dynamic_dname(buffer, buflen, "anon_inode:%s",
|
||||||
dentry->d_name.name);
|
dentry->d_name.name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ static bool prepend_char(struct prepend_buffer *p, unsigned char c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The source of the prepend data can be an optimistoc load
|
* The source of the prepend data can be an optimistic load
|
||||||
* of a dentry name and length. And because we don't hold any
|
* of a dentry name and length. And because we don't hold any
|
||||||
* locks, the length and the pointer to the name may not be
|
* locks, the length and the pointer to the name may not be
|
||||||
* in sync if a concurrent rename happens, and the kernel
|
* in sync if a concurrent rename happens, and the kernel
|
||||||
@ -297,8 +297,7 @@ EXPORT_SYMBOL(d_path);
|
|||||||
/*
|
/*
|
||||||
* Helper function for dentry_operations.d_dname() members
|
* Helper function for dentry_operations.d_dname() members
|
||||||
*/
|
*/
|
||||||
char *dynamic_dname(struct dentry *dentry, char *buffer, int buflen,
|
char *dynamic_dname(char *buffer, int buflen, const char *fmt, ...)
|
||||||
const char *fmt, ...)
|
|
||||||
{
|
{
|
||||||
va_list args;
|
va_list args;
|
||||||
char temp[64];
|
char temp[64];
|
||||||
|
@ -28,7 +28,7 @@ static char *ns_dname(struct dentry *dentry, char *buffer, int buflen)
|
|||||||
struct inode *inode = d_inode(dentry);
|
struct inode *inode = d_inode(dentry);
|
||||||
const struct proc_ns_operations *ns_ops = dentry->d_fsdata;
|
const struct proc_ns_operations *ns_ops = dentry->d_fsdata;
|
||||||
|
|
||||||
return dynamic_dname(dentry, buffer, buflen, "%s:[%lu]",
|
return dynamic_dname(buffer, buflen, "%s:[%lu]",
|
||||||
ns_ops->name, inode->i_ino);
|
ns_ops->name, inode->i_ino);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -860,7 +860,7 @@ static struct vfsmount *pipe_mnt __read_mostly;
|
|||||||
*/
|
*/
|
||||||
static char *pipefs_dname(struct dentry *dentry, char *buffer, int buflen)
|
static char *pipefs_dname(struct dentry *dentry, char *buffer, int buflen)
|
||||||
{
|
{
|
||||||
return dynamic_dname(dentry, buffer, buflen, "pipe:[%lu]",
|
return dynamic_dname(buffer, buflen, "pipe:[%lu]",
|
||||||
d_inode(dentry)->i_ino);
|
d_inode(dentry)->i_ino);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -287,8 +287,8 @@ static inline unsigned d_count(const struct dentry *dentry)
|
|||||||
/*
|
/*
|
||||||
* helper function for dentry_operations.d_dname() members
|
* helper function for dentry_operations.d_dname() members
|
||||||
*/
|
*/
|
||||||
extern __printf(4, 5)
|
extern __printf(3, 4)
|
||||||
char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
|
char *dynamic_dname(char *, int, const char *, ...);
|
||||||
|
|
||||||
extern char *__d_path(const struct path *, const struct path *, char *, int);
|
extern char *__d_path(const struct path *, const struct path *, char *, int);
|
||||||
extern char *d_absolute_path(const struct path *, char *, int);
|
extern char *d_absolute_path(const struct path *, char *, int);
|
||||||
|
@ -355,7 +355,7 @@ static const struct super_operations sockfs_ops = {
|
|||||||
*/
|
*/
|
||||||
static char *sockfs_dname(struct dentry *dentry, char *buffer, int buflen)
|
static char *sockfs_dname(struct dentry *dentry, char *buffer, int buflen)
|
||||||
{
|
{
|
||||||
return dynamic_dname(dentry, buffer, buflen, "socket:[%lu]",
|
return dynamic_dname(buffer, buflen, "socket:[%lu]",
|
||||||
d_inode(dentry)->i_ino);
|
d_inode(dentry)->i_ino);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user