git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
fs
/
cifs
/
cifsfs.c
diff --git
a/fs/cifs/cifsfs.c
b/fs/cifs/cifsfs.c
index
3437163
..
75c4eaa
100644
(file)
--- a/
fs/cifs/cifsfs.c
+++ b/
fs/cifs/cifsfs.c
@@
-318,7
+318,6
@@
cifs_alloc_inode(struct super_block *sb)
return NULL;
cifs_inode->cifsAttrs = 0x20; /* default */
cifs_inode->time = 0;
return NULL;
cifs_inode->cifsAttrs = 0x20; /* default */
cifs_inode->time = 0;
- cifs_inode->write_behind_rc = 0;
/* Until the file is open and we have gotten oplock
info back from the server, can not assume caching of
file data or metadata */
/* Until the file is open and we have gotten oplock
info back from the server, can not assume caching of
file data or metadata */
@@
-545,9
+544,9
@@
static const struct super_operations cifs_super_ops = {
#endif
};
#endif
};
-static
int
-cifs_
get_sb
(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data
, struct vfsmount *mnt
)
+static
struct dentry *
+cifs_
do_mount
(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data)
{
int rc;
struct super_block *sb;
{
int rc;
struct super_block *sb;
@@
-557,18
+556,17
@@
cifs_get_sb(struct file_system_type *fs_type,
cFYI(1, "Devname: %s flags: %d ", dev_name, flags);
if (IS_ERR(sb))
cFYI(1, "Devname: %s flags: %d ", dev_name, flags);
if (IS_ERR(sb))
- return
PTR_ERR
(sb);
+ return
ERR_CAST
(sb);
sb->s_flags = flags;
rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0);
if (rc) {
deactivate_locked_super(sb);
sb->s_flags = flags;
rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0);
if (rc) {
deactivate_locked_super(sb);
- return
rc
;
+ return
ERR_PTR(rc)
;
}
sb->s_flags |= MS_ACTIVE;
}
sb->s_flags |= MS_ACTIVE;
- simple_set_mnt(mnt, sb);
- return 0;
+ return dget(sb->s_root);
}
static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
}
static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
@@
-634,7
+632,7
@@
static int cifs_setlease(struct file *file, long arg, struct file_lock **lease)
struct file_system_type cifs_fs_type = {
.owner = THIS_MODULE,
.name = "cifs",
struct file_system_type cifs_fs_type = {
.owner = THIS_MODULE,
.name = "cifs",
- .
get_sb = cifs_get_sb
,
+ .
mount = cifs_do_mount
,
.kill_sb = kill_anon_super,
/* .fs_flags */
};
.kill_sb = kill_anon_super,
/* .fs_flags */
};