diff options
author | Pavel Shilovsky <pshilovsky@samba.org> | 2012-06-20 03:21:16 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2012-07-24 11:25:08 -0400 |
commit | 6d5786a34d98bffb8ad50d8053d1e53231fe0636 (patch) | |
tree | ae49860befc52cb18dfb2b86929878a204289601 /fs/cifs/xattr.c | |
parent | 2e6e02ab6ddbd539fd7e092973daf057adbd53dc (diff) |
CIFS: Rename Get/FreeXid and make them work with unsigned int
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/xattr.c')
-rw-r--r-- | fs/cifs/xattr.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/cifs/xattr.c b/fs/cifs/xattr.c index 10d92cf57ab6..5142f2c60278 100644 --- a/fs/cifs/xattr.c +++ b/fs/cifs/xattr.c | |||
@@ -39,7 +39,7 @@ int cifs_removexattr(struct dentry *direntry, const char *ea_name) | |||
39 | { | 39 | { |
40 | int rc = -EOPNOTSUPP; | 40 | int rc = -EOPNOTSUPP; |
41 | #ifdef CONFIG_CIFS_XATTR | 41 | #ifdef CONFIG_CIFS_XATTR |
42 | int xid; | 42 | unsigned int xid; |
43 | struct cifs_sb_info *cifs_sb; | 43 | struct cifs_sb_info *cifs_sb; |
44 | struct tcon_link *tlink; | 44 | struct tcon_link *tlink; |
45 | struct cifs_tcon *pTcon; | 45 | struct cifs_tcon *pTcon; |
@@ -60,7 +60,7 @@ int cifs_removexattr(struct dentry *direntry, const char *ea_name) | |||
60 | return PTR_ERR(tlink); | 60 | return PTR_ERR(tlink); |
61 | pTcon = tlink_tcon(tlink); | 61 | pTcon = tlink_tcon(tlink); |
62 | 62 | ||
63 | xid = GetXid(); | 63 | xid = get_xid(); |
64 | 64 | ||
65 | full_path = build_path_from_dentry(direntry); | 65 | full_path = build_path_from_dentry(direntry); |
66 | if (full_path == NULL) { | 66 | if (full_path == NULL) { |
@@ -88,7 +88,7 @@ int cifs_removexattr(struct dentry *direntry, const char *ea_name) | |||
88 | } | 88 | } |
89 | remove_ea_exit: | 89 | remove_ea_exit: |
90 | kfree(full_path); | 90 | kfree(full_path); |
91 | FreeXid(xid); | 91 | free_xid(xid); |
92 | cifs_put_tlink(tlink); | 92 | cifs_put_tlink(tlink); |
93 | #endif | 93 | #endif |
94 | return rc; | 94 | return rc; |
@@ -99,7 +99,7 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name, | |||
99 | { | 99 | { |
100 | int rc = -EOPNOTSUPP; | 100 | int rc = -EOPNOTSUPP; |
101 | #ifdef CONFIG_CIFS_XATTR | 101 | #ifdef CONFIG_CIFS_XATTR |
102 | int xid; | 102 | unsigned int xid; |
103 | struct cifs_sb_info *cifs_sb; | 103 | struct cifs_sb_info *cifs_sb; |
104 | struct tcon_link *tlink; | 104 | struct tcon_link *tlink; |
105 | struct cifs_tcon *pTcon; | 105 | struct cifs_tcon *pTcon; |
@@ -120,7 +120,7 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name, | |||
120 | return PTR_ERR(tlink); | 120 | return PTR_ERR(tlink); |
121 | pTcon = tlink_tcon(tlink); | 121 | pTcon = tlink_tcon(tlink); |
122 | 122 | ||
123 | xid = GetXid(); | 123 | xid = get_xid(); |
124 | 124 | ||
125 | full_path = build_path_from_dentry(direntry); | 125 | full_path = build_path_from_dentry(direntry); |
126 | if (full_path == NULL) { | 126 | if (full_path == NULL) { |
@@ -221,7 +221,7 @@ int cifs_setxattr(struct dentry *direntry, const char *ea_name, | |||
221 | 221 | ||
222 | set_ea_exit: | 222 | set_ea_exit: |
223 | kfree(full_path); | 223 | kfree(full_path); |
224 | FreeXid(xid); | 224 | free_xid(xid); |
225 | cifs_put_tlink(tlink); | 225 | cifs_put_tlink(tlink); |
226 | #endif | 226 | #endif |
227 | return rc; | 227 | return rc; |
@@ -232,7 +232,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name, | |||
232 | { | 232 | { |
233 | ssize_t rc = -EOPNOTSUPP; | 233 | ssize_t rc = -EOPNOTSUPP; |
234 | #ifdef CONFIG_CIFS_XATTR | 234 | #ifdef CONFIG_CIFS_XATTR |
235 | int xid; | 235 | unsigned int xid; |
236 | struct cifs_sb_info *cifs_sb; | 236 | struct cifs_sb_info *cifs_sb; |
237 | struct tcon_link *tlink; | 237 | struct tcon_link *tlink; |
238 | struct cifs_tcon *pTcon; | 238 | struct cifs_tcon *pTcon; |
@@ -253,7 +253,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name, | |||
253 | return PTR_ERR(tlink); | 253 | return PTR_ERR(tlink); |
254 | pTcon = tlink_tcon(tlink); | 254 | pTcon = tlink_tcon(tlink); |
255 | 255 | ||
256 | xid = GetXid(); | 256 | xid = get_xid(); |
257 | 257 | ||
258 | full_path = build_path_from_dentry(direntry); | 258 | full_path = build_path_from_dentry(direntry); |
259 | if (full_path == NULL) { | 259 | if (full_path == NULL) { |
@@ -355,7 +355,7 @@ ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name, | |||
355 | 355 | ||
356 | get_ea_exit: | 356 | get_ea_exit: |
357 | kfree(full_path); | 357 | kfree(full_path); |
358 | FreeXid(xid); | 358 | free_xid(xid); |
359 | cifs_put_tlink(tlink); | 359 | cifs_put_tlink(tlink); |
360 | #endif | 360 | #endif |
361 | return rc; | 361 | return rc; |
@@ -365,7 +365,7 @@ ssize_t cifs_listxattr(struct dentry *direntry, char *data, size_t buf_size) | |||
365 | { | 365 | { |
366 | ssize_t rc = -EOPNOTSUPP; | 366 | ssize_t rc = -EOPNOTSUPP; |
367 | #ifdef CONFIG_CIFS_XATTR | 367 | #ifdef CONFIG_CIFS_XATTR |
368 | int xid; | 368 | unsigned int xid; |
369 | struct cifs_sb_info *cifs_sb; | 369 | struct cifs_sb_info *cifs_sb; |
370 | struct tcon_link *tlink; | 370 | struct tcon_link *tlink; |
371 | struct cifs_tcon *pTcon; | 371 | struct cifs_tcon *pTcon; |
@@ -389,7 +389,7 @@ ssize_t cifs_listxattr(struct dentry *direntry, char *data, size_t buf_size) | |||
389 | return PTR_ERR(tlink); | 389 | return PTR_ERR(tlink); |
390 | pTcon = tlink_tcon(tlink); | 390 | pTcon = tlink_tcon(tlink); |
391 | 391 | ||
392 | xid = GetXid(); | 392 | xid = get_xid(); |
393 | 393 | ||
394 | full_path = build_path_from_dentry(direntry); | 394 | full_path = build_path_from_dentry(direntry); |
395 | if (full_path == NULL) { | 395 | if (full_path == NULL) { |
@@ -409,7 +409,7 @@ ssize_t cifs_listxattr(struct dentry *direntry, char *data, size_t buf_size) | |||
409 | 409 | ||
410 | list_ea_exit: | 410 | list_ea_exit: |
411 | kfree(full_path); | 411 | kfree(full_path); |
412 | FreeXid(xid); | 412 | free_xid(xid); |
413 | cifs_put_tlink(tlink); | 413 | cifs_put_tlink(tlink); |
414 | #endif | 414 | #endif |
415 | return rc; | 415 | return rc; |