aboutsummaryrefslogtreecommitdiffstats
path: root/fs/f2fs/xattr.c
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk.kim@samsung.com>2014-04-22 23:23:14 -0400
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2014-05-06 21:21:56 -0400
commitc02745ef684f9a6f98f30388ed048ee460db5483 (patch)
tree47ee64820f98b6b6dd679565217b7258a4a31ec5 /fs/f2fs/xattr.c
parente112326805a50ee2016faf0971660122471f7c04 (diff)
f2fs: pass flags field to setxattr functions
This patch passes the "flags" field to the low level setxattr functions to use XATTR_REPLACE in the following patches. Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs/xattr.c')
-rw-r--r--fs/f2fs/xattr.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index 1de057d9e7a7..bbe9c2badf5d 100644
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -108,7 +108,8 @@ static int f2fs_xattr_generic_set(struct dentry *dentry, const char *name,
108 if (strcmp(name, "") == 0) 108 if (strcmp(name, "") == 0)
109 return -EINVAL; 109 return -EINVAL;
110 110
111 return f2fs_setxattr(dentry->d_inode, type, name, value, size, NULL); 111 return f2fs_setxattr(dentry->d_inode, type, name,
112 value, size, NULL, flags);
112} 113}
113 114
114static size_t f2fs_xattr_advise_list(struct dentry *dentry, char *list, 115static size_t f2fs_xattr_advise_list(struct dentry *dentry, char *list,
@@ -157,7 +158,7 @@ static int f2fs_xattr_advise_set(struct dentry *dentry, const char *name,
157#ifdef CONFIG_F2FS_FS_SECURITY 158#ifdef CONFIG_F2FS_FS_SECURITY
158static int __f2fs_setxattr(struct inode *inode, int index, 159static int __f2fs_setxattr(struct inode *inode, int index,
159 const char *name, const void *value, size_t size, 160 const char *name, const void *value, size_t size,
160 struct page *ipage); 161 struct page *ipage, int);
161 162
162static int f2fs_initxattrs(struct inode *inode, const struct xattr *xattr_array, 163static int f2fs_initxattrs(struct inode *inode, const struct xattr *xattr_array,
163 void *page) 164 void *page)
@@ -168,7 +169,7 @@ static int f2fs_initxattrs(struct inode *inode, const struct xattr *xattr_array,
168 for (xattr = xattr_array; xattr->name != NULL; xattr++) { 169 for (xattr = xattr_array; xattr->name != NULL; xattr++) {
169 err = __f2fs_setxattr(inode, F2FS_XATTR_INDEX_SECURITY, 170 err = __f2fs_setxattr(inode, F2FS_XATTR_INDEX_SECURITY,
170 xattr->name, xattr->value, 171 xattr->name, xattr->value,
171 xattr->value_len, (struct page *)page); 172 xattr->value_len, (struct page *)page, 0);
172 if (err < 0) 173 if (err < 0)
173 break; 174 break;
174 } 175 }
@@ -479,7 +480,7 @@ cleanup:
479 480
480static int __f2fs_setxattr(struct inode *inode, int index, 481static int __f2fs_setxattr(struct inode *inode, int index,
481 const char *name, const void *value, size_t size, 482 const char *name, const void *value, size_t size,
482 struct page *ipage) 483 struct page *ipage, int flags)
483{ 484{
484 struct f2fs_inode_info *fi = F2FS_I(inode); 485 struct f2fs_inode_info *fi = F2FS_I(inode);
485 struct f2fs_xattr_entry *here, *last; 486 struct f2fs_xattr_entry *here, *last;
@@ -586,7 +587,7 @@ exit:
586 587
587int f2fs_setxattr(struct inode *inode, int index, const char *name, 588int f2fs_setxattr(struct inode *inode, int index, const char *name,
588 const void *value, size_t size, 589 const void *value, size_t size,
589 struct page *ipage) 590 struct page *ipage, int flags)
590{ 591{
591 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); 592 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
592 int err; 593 int err;
@@ -596,7 +597,7 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name,
596 f2fs_lock_op(sbi); 597 f2fs_lock_op(sbi);
597 /* protect xattr_ver */ 598 /* protect xattr_ver */
598 down_write(&F2FS_I(inode)->i_sem); 599 down_write(&F2FS_I(inode)->i_sem);
599 err = __f2fs_setxattr(inode, index, name, value, size, ipage); 600 err = __f2fs_setxattr(inode, index, name, value, size, ipage, flags);
600 up_write(&F2FS_I(inode)->i_sem); 601 up_write(&F2FS_I(inode)->i_sem);
601 f2fs_unlock_op(sbi); 602 f2fs_unlock_op(sbi);
602 603