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>

diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index e93e4ec7d165afe85800bf6acf68f01178d9d836..dbe2141d10ad7d77e67804ec3a8ee0e843a71486 100644 (file)
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -240,7 +240,7 @@ static int __f2fs_set_acl(struct inode *inode, int type,
                }
        }
 
-       error = f2fs_setxattr(inode, name_index, "", value, size, ipage);
+       error = f2fs_setxattr(inode, name_index, "", value, size, ipage, 0);
 
        kfree(value);
        if (!error)

diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index 1de057d9e7a7470afa69e300b77d2c33954e84e6..bbe9c2badf5d5c217ff0fd58cecd8802d2f3ff0e 100644 (file)
--- 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,
        if (strcmp(name, "") == 0)
                return -EINVAL;
 
-       return f2fs_setxattr(dentry->d_inode, type, name, value, size, NULL);
+       return f2fs_setxattr(dentry->d_inode, type, name,
+                                       value, size, NULL, flags);
 }
 
 static 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,
 #ifdef CONFIG_F2FS_FS_SECURITY
 static int __f2fs_setxattr(struct inode *inode, int index,
                        const char *name, const void *value, size_t size,
-                       struct page *ipage);
+                       struct page *ipage, int);
 
 static int f2fs_initxattrs(struct inode *inode, const struct xattr *xattr_array,
                void *page)
@@ -168,7 +169,7 @@ static int f2fs_initxattrs(struct inode *inode, const struct xattr *xattr_array,
        for (xattr = xattr_array; xattr->name != NULL; xattr++) {
                err = __f2fs_setxattr(inode, F2FS_XATTR_INDEX_SECURITY,
                                xattr->name, xattr->value,
-                               xattr->value_len, (struct page *)page);
+                               xattr->value_len, (struct page *)page, 0);
                if (err < 0)
                        break;
        }
@@ -479,7 +480,7 @@ cleanup:
 
 static int __f2fs_setxattr(struct inode *inode, int index,
                        const char *name, const void *value, size_t size,
-                       struct page *ipage)
+                       struct page *ipage, int flags)
 {
        struct f2fs_inode_info *fi = F2FS_I(inode);
        struct f2fs_xattr_entry *here, *last;
@@ -586,7 +587,7 @@ exit:
 
 int f2fs_setxattr(struct inode *inode, int index, const char *name,
                                const void *value, size_t size,
-                               struct page *ipage)
+                               struct page *ipage, int flags)
 {
        struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
        int err;
@@ -596,7 +597,7 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name,
        f2fs_lock_op(sbi);
        /* protect xattr_ver */
        down_write(&F2FS_I(inode)->i_sem);
-       err = __f2fs_setxattr(inode, index, name, value, size, ipage);
+       err = __f2fs_setxattr(inode, index, name, value, size, ipage, flags);
        up_write(&F2FS_I(inode)->i_sem);
        f2fs_unlock_op(sbi);
 

diff --git a/fs/f2fs/xattr.h b/fs/f2fs/xattr.h
index 79bc2bb32aeb1cf4d97b0fda687c44837a423b8f..34ab7dbcf5e3f0867b9afefb0d1e3a4952a247bb 100644 (file)
--- a/fs/f2fs/xattr.h
+++ b/fs/f2fs/xattr.h
@@ -114,14 +114,14 @@ extern const struct xattr_handler f2fs_xattr_security_handler;
 extern const struct xattr_handler *f2fs_xattr_handlers[];
 
 extern int f2fs_setxattr(struct inode *, int, const char *,
-                               const void *, size_t, struct page *);
+                               const void *, size_t, struct page *, int);
 extern int f2fs_getxattr(struct inode *, int, const char *, void *, size_t);
 extern ssize_t f2fs_listxattr(struct dentry *, char *, size_t);
 #else
 
 #define f2fs_xattr_handlers    NULL
 static inline int f2fs_setxattr(struct inode *inode, int index,
-               const char *name, const void *value, size_t size)
+               const char *name, const void *value, size_t size, int flags)
 {
        return -EOPNOTSUPP;
 }