git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tty: use the new 'flush_delayed_work()' helper to do ldisc flush
[safe/jmp/linux-2.6]
/
fs
/
cifs
/
xattr.c
diff --git
a/fs/cifs/xattr.c
b/fs/cifs/xattr.c
index
8cd6a44
..
a75afa3
100644
(file)
--- a/
fs/cifs/xattr.c
+++ b/
fs/cifs/xattr.c
@@
-64,8
+64,9
@@
int cifs_removexattr(struct dentry *direntry, const char *ea_name)
full_path = build_path_from_dentry(direntry);
if (full_path == NULL) {
full_path = build_path_from_dentry(direntry);
if (full_path == NULL) {
+ rc = -ENOMEM;
FreeXid(xid);
FreeXid(xid);
- return
-ENOMEM
;
+ return
rc
;
}
if (ea_name == NULL) {
cFYI(1, ("Null xattr names not supported"));
}
if (ea_name == NULL) {
cFYI(1, ("Null xattr names not supported"));
@@
-118,8
+119,9
@@
int cifs_setxattr(struct dentry *direntry, const char *ea_name,
full_path = build_path_from_dentry(direntry);
if (full_path == NULL) {
full_path = build_path_from_dentry(direntry);
if (full_path == NULL) {
+ rc = -ENOMEM;
FreeXid(xid);
FreeXid(xid);
- return
-ENOMEM
;
+ return
rc
;
}
/* return dos attributes as pseudo xattr */
/* return alt name if available as pseudo attr */
}
/* return dos attributes as pseudo xattr */
/* return alt name if available as pseudo attr */
@@
-225,8
+227,9
@@
ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
full_path = build_path_from_dentry(direntry);
if (full_path == NULL) {
full_path = build_path_from_dentry(direntry);
if (full_path == NULL) {
+ rc = -ENOMEM;
FreeXid(xid);
FreeXid(xid);
- return
-ENOMEM
;
+ return
rc
;
}
/* return dos attributes as pseudo xattr */
/* return alt name if available as pseudo attr */
}
/* return dos attributes as pseudo xattr */
/* return alt name if available as pseudo attr */
@@
-264,7
+267,7
@@
ssize_t cifs_getxattr(struct dentry *direntry, const char *ea_name,
#ifdef CONFIG_CIFS_EXPERIMENTAL
else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
__u16 fid;
#ifdef CONFIG_CIFS_EXPERIMENTAL
else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL) {
__u16 fid;
- int oplock =
FALSE
;
+ int oplock =
0
;
struct cifs_ntsd *pacl = NULL;
__u32 buflen = 0;
if (experimEnabled)
struct cifs_ntsd *pacl = NULL;
__u32 buflen = 0;
if (experimEnabled)
@@
-351,8
+354,9
@@
ssize_t cifs_listxattr(struct dentry *direntry, char *data, size_t buf_size)
full_path = build_path_from_dentry(direntry);
if (full_path == NULL) {
full_path = build_path_from_dentry(direntry);
if (full_path == NULL) {
+ rc = -ENOMEM;
FreeXid(xid);
FreeXid(xid);
- return
-ENOMEM
;
+ return
rc
;
}
/* return dos attributes as pseudo xattr */
/* return alt name if available as pseudo attr */
}
/* return dos attributes as pseudo xattr */
/* return alt name if available as pseudo attr */