projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/shaggy/git/linus-clean/
[firefly-linux-kernel-4.4.55.git]
/
fs
/
jfs
/
super.c
diff --git
a/fs/jfs/super.c
b/fs/jfs/super.c
index 0dae345e481b4b3ff235691a19ca9384cdddb0d1..6f21adf9479af7602009a736b5cede2b820db79c 100644
(file)
--- a/
fs/jfs/super.c
+++ b/
fs/jfs/super.c
@@
-29,6
+29,7
@@
#include <linux/posix_acl.h>
#include <linux/buffer_head.h>
#include <linux/exportfs.h>
#include <linux/posix_acl.h>
#include <linux/buffer_head.h>
#include <linux/exportfs.h>
+#include <linux/crc32.h>
#include <asm/uaccess.h>
#include <linux/seq_file.h>
#include <asm/uaccess.h>
#include <linux/seq_file.h>
@@
-168,6
+169,9
@@
static int jfs_statfs(struct dentry *dentry, struct kstatfs *buf)
buf->f_files = maxinodes;
buf->f_ffree = maxinodes - (atomic_read(&imap->im_numinos) -
atomic_read(&imap->im_numfree));
buf->f_files = maxinodes;
buf->f_ffree = maxinodes - (atomic_read(&imap->im_numinos) -
atomic_read(&imap->im_numfree));
+ buf->f_fsid.val[0] = (u32)crc32_le(0, sbi->uuid, sizeof(sbi->uuid)/2);
+ buf->f_fsid.val[1] = (u32)crc32_le(0, sbi->uuid + sizeof(sbi->uuid)/2,
+ sizeof(sbi->uuid)/2);
buf->f_namelen = JFS_NAME_MAX;
return 0;
buf->f_namelen = JFS_NAME_MAX;
return 0;
@@
-543,7
+547,7
@@
out_kfree:
return ret;
}
return ret;
}
-static
void jfs_write_super_lockfs
(struct super_block *sb)
+static
int jfs_freeze
(struct super_block *sb)
{
struct jfs_sb_info *sbi = JFS_SBI(sb);
struct jfs_log *log = sbi->log;
{
struct jfs_sb_info *sbi = JFS_SBI(sb);
struct jfs_log *log = sbi->log;
@@
-553,9
+557,10
@@
static void jfs_write_super_lockfs(struct super_block *sb)
lmLogShutdown(log);
updateSuper(sb, FM_CLEAN);
}
lmLogShutdown(log);
updateSuper(sb, FM_CLEAN);
}
+ return 0;
}
}
-static
void jfs_unlockfs
(struct super_block *sb)
+static
int jfs_unfreeze
(struct super_block *sb)
{
struct jfs_sb_info *sbi = JFS_SBI(sb);
struct jfs_log *log = sbi->log;
{
struct jfs_sb_info *sbi = JFS_SBI(sb);
struct jfs_log *log = sbi->log;
@@
-568,6
+573,7
@@
static void jfs_unlockfs(struct super_block *sb)
else
txResume(sb);
}
else
txResume(sb);
}
+ return 0;
}
static int jfs_get_sb(struct file_system_type *fs_type,
}
static int jfs_get_sb(struct file_system_type *fs_type,
@@
-735,8
+741,8
@@
static const struct super_operations jfs_super_operations = {
.delete_inode = jfs_delete_inode,
.put_super = jfs_put_super,
.sync_fs = jfs_sync_fs,
.delete_inode = jfs_delete_inode,
.put_super = jfs_put_super,
.sync_fs = jfs_sync_fs,
- .
write_super_lockfs = jfs_write_super_lockfs
,
- .un
lockfs = jfs_unlockfs
,
+ .
freeze_fs = jfs_freeze
,
+ .un
freeze_fs = jfs_unfreeze
,
.statfs = jfs_statfs,
.remount_fs = jfs_remount,
.show_options = jfs_show_options,
.statfs = jfs_statfs,
.remount_fs = jfs_remount,
.show_options = jfs_show_options,