Commit a6d879fd authored by Henri Doreau's avatar Henri Doreau Committed by Greg Kroah-Hartman
Browse files

staging: lustre: llite: Add ioctl to get parent fids from link EA. 



Added LL_IOC_GETPARENT to retrieve the <parent_fid>/name(s) of a given
entry, based on its link EA. This saves multiple calls to
path2fid/fid2path.

Merged with second later patch that does various cleanups.
Avoid unneeded allocation. Get read-only attributes from the user
getparent structure and write the modified attributes only, instead
of populating a whole structure in kernel and copying it back.

Signed-off-by: default avatarThomas Leibovici <thomas.leibovici@cea.fr>
Signed-off-by: default avatarHenri Doreau <henri.doreau@cea.fr>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3613
Reviewed-on: http://review.whamcloud.com/7069
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5837
Reviewed-on: http://review.whamcloud.com/12527


Reviewed-by: default avatarNed Bass <bass6@llnl.gov>
Reviewed-by: default avatarfrank zago <fzago@cray.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb1ddc67

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

+8 −0
Original line number Diff line number Diff line
@@ -3468,6 +3468,14 @@ struct getinfo_fid2path { 


void lustre_swab_fid2path(struct getinfo_fid2path *gf);



/** path2parent request/reply structures */

struct getparent {

	struct lu_fid	gp_fid;		/**< parent FID */

	__u32		gp_linkno;	/**< hardlink number */

	__u32		gp_name_size;	/**< size of the name field */

	char		gp_name[0];	/**< zero-terminated link name */

} __packed;



enum {

	LAYOUT_INTENT_ACCESS    = 0,

	LAYOUT_INTENT_READ      = 1,

drivers/staging/lustre/lustre/include/lustre/lustre_user.h

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ struct ost_id { 
#define LL_IOC_LMV_SET_DEFAULT_STRIPE	_IOWR('f', 246, struct lmv_user_md)

#define LL_IOC_MIGRATE			_IOR('f', 247, int)

#define LL_IOC_FID2MDTIDX		_IOWR('f', 248, struct lu_fid)

#define LL_IOC_GETPARENT		_IOWR('f', 249, struct getparent)



/* Lease types for use as arg and return of LL_IOC_{GET,SET}_LEASE ioctl. */

enum ll_lease_type {

drivers/staging/lustre/lustre/llite/dir.c

+2 −0
Original line number Diff line number Diff line
@@ -1562,6 +1562,8 @@ static long ll_dir_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		return rc;

	case OBD_IOC_FID2PATH:

		return ll_fid2path(inode, (void __user *)arg);

	case LL_IOC_GETPARENT:

		return ll_getparent(file, (void __user *)arg);

	case LL_IOC_FID2MDTIDX: {

		struct obd_export *exp = ll_i2mdexp(inode);

		struct lu_fid fid;

drivers/staging/lustre/lustre/llite/file.c

+2 −0
Original line number Diff line number Diff line
@@ -2362,6 +2362,8 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


		return 0;

	}

	case LL_IOC_GETPARENT:

		return ll_getparent(file, (struct getparent __user *)arg);

	case OBD_IOC_FID2PATH:

		return ll_fid2path(inode, (void __user *)arg);

	case LL_IOC_DATA_VERSION: {

drivers/staging/lustre/lustre/llite/llite_internal.h

+13 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "../include/lustre_ver.h"

#include "../include/lustre_disk.h"	/* for s2sbi */

#include "../include/lustre_eacl.h"

#include "../include/lustre_linkea.h"



/* for struct cl_lock_descr and struct cl_io */

#include "../include/cl_object.h"
@@ -1038,7 +1039,17 @@ static inline __u64 ll_file_maxbytes(struct inode *inode) 
/* llite/xattr.c */

extern const struct xattr_handler *ll_xattr_handlers[];



#define XATTR_USER_T		1

#define XATTR_TRUSTED_T		2

#define XATTR_SECURITY_T	3

#define XATTR_ACL_ACCESS_T	4

#define XATTR_ACL_DEFAULT_T	5

#define XATTR_LUSTRE_T		6

#define XATTR_OTHER_T		7



ssize_t ll_listxattr(struct dentry *dentry, char *buffer, size_t size);

int ll_xattr_list(struct inode *inode, const char *name, int type,

		  void *buffer, size_t size, __u64 valid);



/**

 * Common IO arguments for various VFS I/O interfaces.
@@ -1399,6 +1410,8 @@ void ll_xattr_fini(void); 
int ll_page_sync_io(const struct lu_env *env, struct cl_io *io,

		    struct cl_page *page, enum cl_req_type crt);



int ll_getparent(struct file *file, struct getparent __user *arg);



/* lcommon_cl.c */

int cl_setattr_ost(struct inode *inode, const struct iattr *attr);